Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Bakker <jeroen@blender.org>2022-01-05 16:58:34 +0300
committerJeroen Bakker <jeroen@blender.org>2022-01-05 17:00:07 +0300
commit29ab711efa01a94d7d407c29755cd697dbd02276 (patch)
tree7a59732258155a0f7850865355c3ccee2b5efdea /source/blender/gpu/shaders/gpu_shader_uniform_color_frag.glsl
parent4c3f52e7dc868471393cab76619b1187a654bc43 (diff)
Cleanup: Remove unused code (USE_COLOR_U32)
Diffstat (limited to 'source/blender/gpu/shaders/gpu_shader_uniform_color_frag.glsl')
-rw-r--r--source/blender/gpu/shaders/gpu_shader_uniform_color_frag.glsl14
1 files changed, 1 insertions, 13 deletions
diff --git a/source/blender/gpu/shaders/gpu_shader_uniform_color_frag.glsl b/source/blender/gpu/shaders/gpu_shader_uniform_color_frag.glsl
index 2033401db67..08623fa9935 100644
--- a/source/blender/gpu/shaders/gpu_shader_uniform_color_frag.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_uniform_color_frag.glsl
@@ -1,21 +1,9 @@
-#if defined(USE_COLOR_U32)
-uniform uint color;
-#else
uniform vec4 color;
-#endif
out vec4 fragColor;
void main()
{
-#if defined(USE_COLOR_U32)
- fragColor = vec4(((color)&uint(0xFF)) * (1.0f / 255.0f),
- ((color >> 8) & uint(0xFF)) * (1.0f / 255.0f),
- ((color >> 16) & uint(0xFF)) * (1.0f / 255.0f),
- ((color >> 24)) * (1.0f / 255.0f));
-#else
- fragColor = color;
-#endif
- fragColor = blender_srgb_to_framebuffer_space(fragColor);
+ fragColor = blender_srgb_to_framebuffer_space(color);
}