diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2020-09-05 19:47:02 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2020-09-05 19:50:07 +0300 |
| commit | 8c4f7e6d046f881d790493eec09e23857b41b591 (patch) | |
| tree | 1f133c7e3e60ade0963d226cb63a90607becf651 /source | |
| parent | ffec86bb62c52665ef6a05770f03ab69fa6bb231 (diff) | |
GLState: Use unsigned long long instead of unsigned long for shifts
This fix a compilation warning on msvc.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/gpu/opengl/gl_state.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/gpu/opengl/gl_state.cc b/source/blender/gpu/opengl/gl_state.cc index dc0317726a8..dc6d475d39f 100644 --- a/source/blender/gpu/opengl/gl_state.cc +++ b/source/blender/gpu/opengl/gl_state.cc @@ -447,7 +447,7 @@ void GLStateManager::texture_bind(Texture *tex_, eGPUSamplerState sampler_type, textures_[unit] = tex->tex_id_; samplers_[unit] = GLTexture::samplers_[sampler_type]; tex->is_bound_ = true; - dirty_texture_binds_ |= 1UL << unit; + dirty_texture_binds_ |= 1ULL << unit; } /* Bind the texture to slot 0 for editing purpose. Used by legacy pipeline. */ @@ -457,7 +457,7 @@ void GLStateManager::texture_bind_temp(GLTexture *tex) glActiveTexture(GL_TEXTURE0); glBindTexture(tex->target_, tex->tex_id_); /* Will reset the first texture that was originally bound to slot 0 back before drawing. */ - dirty_texture_binds_ |= 1UL; + dirty_texture_binds_ |= 1ULL; /* NOTE: This might leave this texture attached to this target even after update. * In practice it is not causing problems as we have incorrect binding detection * at higher level. */ @@ -475,7 +475,7 @@ void GLStateManager::texture_unbind(Texture *tex_) if (textures_[i] == tex_id) { textures_[i] = 0; samplers_[i] = 0; - dirty_texture_binds_ |= 1UL << i; + dirty_texture_binds_ |= 1ULL << i; } } tex->is_bound_ = false; @@ -487,7 +487,7 @@ void GLStateManager::texture_unbind_all(void) if (textures_[i] != 0) { textures_[i] = 0; samplers_[i] = 0; - dirty_texture_binds_ |= 1UL << i; + dirty_texture_binds_ |= 1ULL << i; } } this->texture_bind_apply(); @@ -525,7 +525,7 @@ uint64_t GLStateManager::bound_texture_slots(void) uint64_t bound_slots = 0; for (int i = 0; i < ARRAY_SIZE(textures_); i++) { if (textures_[i] != 0) { - bound_slots |= 1UL << i; + bound_slots |= 1ULL << i; } } return bound_slots; |