[Bf-blender-cvs] [4d28a1d75fd] master: Fix OpenColorIO 2.0 GPU shader error in uniform assignment

[Brecht Van Lommel]

Commit: 4d28a1d75fded6176b495b72d843487c35a6890d
Author: Brecht Van Lommel
Date:   Wed Feb 17 17:57:14 2021 +0100
Branches: master
https://developer.blender.org/rB4d28a1d75fded6176b495b72d843487c35a6890d

Fix OpenColorIO 2.0 GPU shader error in uniform assignment

And fix a (harmless) compiler warning.

===================================================================

M	intern/opencolorio/ocio_impl_glsl.cc
M	source/blender/imbuf/intern/colormanagement.c

===================================================================

diff --git a/intern/opencolorio/ocio_impl_glsl.cc b/intern/opencolorio/ocio_impl_glsl.cc
index 841f1386af1..590d7c07002 100644
--- a/intern/opencolorio/ocio_impl_glsl.cc
+++ b/intern/opencolorio/ocio_impl_glsl.cc
@@ -252,7 +252,7 @@ static bool createGPUShader(OCIO_GPUShader &shader,
   /* Set uniforms. */
   for (OCIO_GPUUniform &uniform : textures.uniforms) {
     const GpuShaderDesc::UniformData &data = uniform.data;
-    const char *name = name;
+    const char *name = uniform.name.c_str();
 
     if (data.m_getDouble) {
       GPU_shader_uniform_1f(sh, name, (float)data.m_getDouble());
diff --git a/source/blender/imbuf/intern/colormanagement.c b/source/blender/imbuf/intern/colormanagement.c
index 8f8c12aa3b4..fc0b99a82fa 100644
--- a/source/blender/imbuf/intern/colormanagement.c
+++ b/source/blender/imbuf/intern/colormanagement.c
@@ -115,7 +115,7 @@ static struct global_gpu_state {
   bool use_curve_mapping;
   int curve_mapping_timestamp;
   OCIO_CurveMappingSettings curve_mapping_settings;
-} global_gpu_state = {NULL};
+} global_gpu_state = {false};
 
 static struct global_color_picking_state {
   /* Cached processor for color picking conversion. */