Compute shader cleanup

1 files changed, 33 insertions, 30 deletions

diff --git a/src/color_conversion.c b/src/color_conversion.c
index a54407b..ffea5bb 100644
--- a/src/color_conversion.c
+++ b/src/color_conversion.c
@@ -87,24 +87,25 @@ static int load_compute_shader_y(gsr_shader *shader, gsr_egl *egl, gsr_color_uni
         "#extension GL_OES_EGL_image_external_essl3 : require\n"
         "precision highp float;\n"
         "layout (local_size_x = %d, local_size_y = %d, local_size_z = 1) in;\n"
-        "layout(binding = 0) uniform highp %s imgInput;\n"
-        "layout(binding = 1) uniform highp sampler2D imgBackground;\n"
+        "layout(binding = 0) uniform highp %s img_input;\n"
+        "layout(binding = 1) uniform highp sampler2D img_background;\n"
         "uniform ivec2 source_position;\n"
         "uniform ivec2 target_position;\n"
         "uniform vec2 scale;\n"
         "uniform mat2 rotation_matrix;\n"
-        "layout(rgba8, binding = 0) writeonly uniform highp image2D imgOutput;\n"
+        "layout(rgba8, binding = 0) writeonly uniform highp image2D img_output;\n"
         "%s"
         "void main() {\n"
-        "    ivec2 texelCoord = ivec2(gl_GlobalInvocationID.xy);\n"
-        "    ivec2 size = ivec2(vec2(textureSize(imgInput, 0)) * scale + 0.5);\n"
-        "    vec2 rotated_texel_coord = vec2(texelCoord - source_position - size/2) * rotation_matrix + vec2(size/2) + 0.5;\n"
-        "    vec2 texCoord = vec2(rotated_texel_coord)/vec2(size);\n"
-        "    vec4 source_color = texture(imgInput, texCoord);\n"
+        "    ivec2 texel_coord = ivec2(gl_GlobalInvocationID.xy);\n"
+        "    ivec2 size = ivec2(vec2(textureSize(img_input, 0)) * scale + 0.5);\n"
+        "    ivec2 output_size = textureSize(img_background, 0);\n"
+        "    vec2 rotated_texel_coord = vec2(texel_coord - source_position - size/2) * rotation_matrix + vec2(size/2) + 0.5;\n"
+        "    vec2 tex_coord = vec2(rotated_texel_coord)/vec2(size);\n"
+        "    vec4 source_color = texture(img_input, tex_coord);\n"
         "    vec4 source_color_yuv = RGBtoYUV * vec4(source_color.rgb, 1.0);\n"
-        "    vec4 output_color_yuv = texture(imgBackground, (rotated_texel_coord + vec2(target_position))/vec2(textureSize(imgBackground, 0)));\n"
+        "    vec4 output_color_yuv = texture(img_background, (rotated_texel_coord + vec2(target_position))/vec2(output_size));\n"
         "    float y_color = mix(output_color_yuv.r, source_color_yuv.r, source_color.a);\n"
-        "    imageStore(imgOutput, texelCoord + target_position, vec4(y_color, 1.0, 1.0, 1.0));\n"
+        "    imageStore(img_output, texel_coord + target_position, vec4(y_color, 1.0, 1.0, 1.0));\n"
         "}\n", max_local_size_dim, max_local_size_dim, external_texture ? "samplerExternalOES" : "sampler2D", color_transform_matrix);
 
     if(gsr_shader_init(shader, egl, NULL, NULL, compute_shader) != 0)
@@ -127,24 +128,25 @@ static int load_compute_shader_uv(gsr_shader *shader, gsr_egl *egl, gsr_color_un
         "#extension GL_OES_EGL_image_external_essl3 : require\n"
         "precision highp float;\n"
         "layout (local_size_x = %d, local_size_y = %d, local_size_z = 1) in;\n"
-        "layout(binding = 0) uniform highp %s imgInput;\n"
-        "layout(binding = 1) uniform highp sampler2D imgBackground;\n"
+        "layout(binding = 0) uniform highp %s img_input;\n"
+        "layout(binding = 1) uniform highp sampler2D img_background;\n"
         "uniform ivec2 source_position;\n"
         "uniform ivec2 target_position;\n"
         "uniform vec2 scale;\n"
         "uniform mat2 rotation_matrix;\n"
-        "layout(rgba8, binding = 0) writeonly uniform highp image2D imgOutput;\n"
+        "layout(rgba8, binding = 0) writeonly uniform highp image2D img_output;\n"
         "%s"
         "void main() {\n"
-        "    ivec2 texelCoord = ivec2(gl_GlobalInvocationID.xy);\n"
-        "    ivec2 size = ivec2(vec2(textureSize(imgInput, 0)) * scale + 0.5);\n"
-        "    vec2 rotated_texel_coord = vec2(texelCoord - source_position/2 - size/4) * rotation_matrix + vec2(size/4) + 0.5;\n"
-        "    vec2 texCoord = vec2(rotated_texel_coord)/vec2(size);\n"
-        "    vec4 source_color = texture(imgInput, texCoord * 2.0);\n"
+        "    ivec2 texel_coord = ivec2(gl_GlobalInvocationID.xy);\n"
+        "    ivec2 size = ivec2(vec2(textureSize(img_input, 0)) * scale + 0.5);\n"
+        "    ivec2 output_size = textureSize(img_background, 0);\n"
+        "    vec2 rotated_texel_coord = vec2(texel_coord - source_position/2 - size/4) * rotation_matrix + vec2(size/4) + 0.5;\n"
+        "    vec2 tex_coord = vec2(rotated_texel_coord)/vec2(size);\n"
+        "    vec4 source_color = texture(img_input, tex_coord * 2.0);\n"
         "    vec4 source_color_yuv = RGBtoYUV * vec4(source_color.rgb, 1.0);\n"
-        "    vec4 output_color_yuv = texture(imgBackground, (rotated_texel_coord + vec2(target_position/2))/vec2(textureSize(imgBackground, 0)));\n"
+        "    vec4 output_color_yuv = texture(img_background, (rotated_texel_coord + vec2(target_position/2))/vec2(output_size));\n"
         "    vec2 uv_color = mix(output_color_yuv.rg, source_color_yuv.gb, source_color.a);\n"
-        "    imageStore(imgOutput, texelCoord + target_position/2, vec4(uv_color, 1.0, 1.0));\n"
+        "    imageStore(img_output, texel_coord + target_position/2, vec4(uv_color, 1.0, 1.0));\n"
         "}\n", max_local_size_dim, max_local_size_dim, external_texture ? "samplerExternalOES" : "sampler2D", color_transform_matrix);
 
     if(gsr_shader_init(shader, egl, NULL, NULL, compute_shader) != 0)
@@ -164,22 +166,23 @@ static int load_compute_shader_rgb(gsr_shader *shader, gsr_egl *egl, gsr_color_u
         "#extension GL_OES_EGL_image_external : enable\n"
         "#extension GL_OES_EGL_image_external_essl3 : require\n"
         "layout (local_size_x = %d, local_size_y = %d, local_size_z = 1) in;\n"
-        "layout(binding = 0) uniform highp %s imgInput;\n"
-        "layout(binding = 1) uniform highp sampler2D imgBackground;\n"
+        "layout(binding = 0) uniform highp %s img_input;\n"
+        "layout(binding = 1) uniform highp sampler2D img_background;\n"
         "uniform ivec2 source_position;\n"
         "uniform ivec2 target_position;\n"
         "uniform vec2 scale;\n"
         "uniform mat2 rotation_matrix;\n"
-        "layout(rgba8, binding = 0) writeonly uniform highp image2D imgOutput;\n"
+        "layout(rgba8, binding = 0) writeonly uniform highp image2D img_output;\n"
         "void main() {\n"
-        "    ivec2 texelCoord = ivec2(gl_GlobalInvocationID.xy);\n"
-        "    ivec2 size = ivec2(vec2(textureSize(imgInput, 0)) * scale + 0.5);\n"
-        "    vec2 rotated_texel_coord = vec2(texelCoord - source_position - size/2) * rotation_matrix + vec2(size/2) + 0.5;\n"
-        "    vec2 texCoord = vec2(rotated_texel_coord)/vec2(size);\n"
-        "    vec4 source_color = texture(imgInput, texCoord);\n"
-        "    vec4 output_color = texture(imgBackground, (rotated_texel_coord + vec2(target_position))/vec2(textureSize(imgBackground, 0)));\n"
+        "    ivec2 texel_coord = ivec2(gl_GlobalInvocationID.xy);\n"
+        "    ivec2 size = ivec2(vec2(textureSize(img_input, 0)) * scale + 0.5);\n"
+        "    ivec2 output_size = textureSize(img_background, 0);\n"
+        "    vec2 rotated_texel_coord = vec2(texel_coord - source_position - size/2) * rotation_matrix + vec2(size/2) + 0.5;\n"
+        "    vec2 tex_coord = vec2(rotated_texel_coord)/vec2(size);\n"
+        "    vec4 source_color = texture(img_input, tex_coord);\n"
+        "    vec4 output_color = texture(img_background, (rotated_texel_coord + vec2(target_position))/vec2(output_size));\n"
         "    vec3 color = mix(output_color.rgb, source_color.rgb, source_color.a);\n"
-        "    imageStore(imgOutput, texelCoord + target_position, vec4(color, 1.0));\n"
+        "    imageStore(img_output, texel_coord + target_position, vec4(color, 1.0));\n"
         "}\n", max_local_size_dim, max_local_size_dim, external_texture ? "samplerExternalOES" : "sampler2D");
 
     if(gsr_shader_init(shader, egl, NULL, NULL, compute_shader) != 0)