Cleanup: Remove unused code (USE_COLOR_U32)

This commit is contained in:
Jeroen Bakker 2022-01-05 14:58:34 +01:00
parent 4c3f52e7dc
commit 29ab711efa
2 changed files with 1 additions and 25 deletions

View File

@ -5,11 +5,7 @@ uniform mat4 ModelMatrix;
#endif
in vec3 pos;
#if defined(USE_COLOR_U32)
in uint color;
#else
in vec4 color;
#endif
flat out vec4 finalColor;
@ -17,15 +13,7 @@ void main()
{
vec4 pos_4d = vec4(pos, 1.0);
gl_Position = ModelViewProjectionMatrix * pos_4d;
#if defined(USE_COLOR_U32)
finalColor = 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
finalColor = color;
#endif
#ifdef USE_WORLD_CLIP_PLANES
world_clip_planes_calc_clip_distance((ModelMatrix * pos_4d).xyz);

View File

@ -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);
}