diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-10-09 12:49:27 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-10-09 12:49:27 +0300 |
| commit | a5b4b0f21c1ae8c96e4fea9abdcfac2fab1cf300 (patch) | |
| tree | 0658d8bdfb8ec03652aa04f82ee8a4d243ec6370 /source/blender/gpu/shaders/gpu_shader_uniform_color_frag.glsl | |
| parent | d68f698cf0321477c0734474150eb4bc43c4e85f (diff) | |
| parent | abcda06934aba054de8540b66b13c2bbc5f8f515 (diff) | |
Merge branch '28' into custom-manipulatorscustom-manipulators
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.glsl | 12 |
1 files changed, 12 insertions, 0 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 5dd1352adc5..118a661863d 100644 --- a/source/blender/gpu/shaders/gpu_shader_uniform_color_frag.glsl +++ b/source/blender/gpu/shaders/gpu_shader_uniform_color_frag.glsl @@ -1,9 +1,21 @@ +#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 } |