Skip to content

Commit

Permalink
bug fix
Browse files Browse the repository at this point in the history
  • Loading branch information
MichaelMoroz committed Aug 25, 2019
1 parent 1bed091 commit 6d2768f
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 819 deletions.
2 changes: 1 addition & 1 deletion game_folder/shaders/compute/Bloom_horiz.glsl
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ void main() {
color_buffer[local_indx.x + group_size/2] = bloom_treshold(imageLoad(color_HDR, global_pos).xyz, Camera.exposure);
int new_coord = safe_coord(global_pos.x + shift(local_indx.x), img_size);
color_buffer[local_indx.x + group_size/2 + shift(local_indx.x)] =
(new_coord!=-1)?bloom_treshold(imageLoad(color_HDR, ivec2(new_coord,global_pos.y)).xyz, Camera.exposure):0;
(new_coord!=-1)?bloom_treshold(imageLoad(color_HDR, ivec2(new_coord,global_pos.y)).xyz, Camera.exposure):vec3(0);
memoryBarrierShared();
barrier();

Expand Down
123 changes: 0 additions & 123 deletions game_folder/shaders/compute/Bloom_horiz.glsl_error.txt

This file was deleted.

4 changes: 2 additions & 2 deletions game_folder/shaders/compute/Bloom_vertic.glsl
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@ void main() {
color_buffer_hoz1[local_indx.y + group_size/2] = imageLoad(blurred_hor1, global_pos).xyz;
int new_coord = safe_coord(global_pos.y + shift(local_indx.y), img_size);
color_buffer_hoz1[local_indx.y + group_size/2 + shift(local_indx.y)] =
(new_coord!=-1)?imageLoad(blurred_hor1, ivec2(global_pos.x,new_coord)).xyz:0;
(new_coord!=-1)?imageLoad(blurred_hor1, ivec2(global_pos.x,new_coord)).xyz:vec3(0);

color_buffer_hoz2[local_indx.y + group_size/2] = imageLoad(blurred_hor2, global_pos).xyz;
new_coord = safe_coord(global_pos.y + shift(local_indx.y), img_size);
color_buffer_hoz2[local_indx.y + group_size/2 + shift(local_indx.y)] =
(new_coord!=-1)?imageLoad(blurred_hor2, ivec2(global_pos.x,new_coord)).xyz:0;
(new_coord!=-1)?imageLoad(blurred_hor2, ivec2(global_pos.x,new_coord)).xyz:vec3(0);

memoryBarrierShared();
barrier();
Expand Down
Loading

0 comments on commit 6d2768f

Please sign in to comment.