[Bf-blender-cvs] [e3fd0b1d177] master: Fix compiler warning on Windows

Antonio Vazquez noreply at git.blender.org
Mon Jan 17 16:08:56 CET 2022


Commit: e3fd0b1d177cb1a17e6ec729b7d695465f67ead8
Author: Antonio Vazquez
Date:   Mon Jan 17 16:08:48 2022 +0100
Branches: master
https://developer.blender.org/rBe3fd0b1d177cb1a17e6ec729b7d695465f67ead8

Fix compiler warning on Windows

The variable was `uint64_t` and needs `1ull`

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

M	source/blender/gpu/opengl/gl_shader_interface.cc

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

diff --git a/source/blender/gpu/opengl/gl_shader_interface.cc b/source/blender/gpu/opengl/gl_shader_interface.cc
index 9dd7b1d57c3..2211c2fbb7c 100644
--- a/source/blender/gpu/opengl/gl_shader_interface.cc
+++ b/source/blender/gpu/opengl/gl_shader_interface.cc
@@ -402,7 +402,7 @@ GLShaderInterface::GLShaderInterface(GLuint program, const shader::ShaderCreateI
         glUniform1i(input->location, res.slot);
       }
       input->binding = res.slot;
-      enabled_tex_mask_ |= (1 << input->binding);
+      enabled_tex_mask_ |= (1ull << input->binding);
       input++;
     }
     else if (res.bind_type == ShaderCreateInfo::Resource::BindType::IMAGE) {



More information about the Bf-blender-cvs mailing list