Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClément Foucault <foucault.clem@gmail.com>2020-08-19 18:10:18 +0300
committerClément Foucault <foucault.clem@gmail.com>2020-08-19 18:13:53 +0300
commit1dafa87eb5ec355148e8cff86dd78e2727d34044 (patch)
tree7f251d452bf4a99c77e5bf1a6fa163433a5f1450 /source/blender/gpu/opengl/gl_state.cc
parentfccb38cf19bac0f7cc5914cce724994dcddcafc1 (diff)
GPUState: Fix signed / bitfield conversion leading to wrong enum value
This was creating drawing issues on windows builds.
Diffstat (limited to 'source/blender/gpu/opengl/gl_state.cc')
-rw-r--r--source/blender/gpu/opengl/gl_state.cc16
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/gpu/opengl/gl_state.cc b/source/blender/gpu/opengl/gl_state.cc
index 3e3695e0b48..4e21ab43b45 100644
--- a/source/blender/gpu/opengl/gl_state.cc
+++ b/source/blender/gpu/opengl/gl_state.cc
@@ -65,23 +65,23 @@ void GLStateManager::set_state(const GPUState &state)
GPUState changed = state ^ current_;
if (changed.blend != 0) {
- set_blend(state.blend);
+ set_blend((eGPUBlend)state.blend);
}
if (changed.write_mask != 0) {
- set_write_mask(state.write_mask);
+ set_write_mask((eGPUWriteMask)state.write_mask);
}
if (changed.depth_test != 0) {
- set_depth_test(state.depth_test);
+ set_depth_test((eGPUDepthTest)state.depth_test);
}
if (changed.stencil_test != 0 || changed.stencil_op != 0) {
- set_stencil_test(state.stencil_test, state.stencil_op);
- set_stencil_mask(state.stencil_test, mutable_state);
+ set_stencil_test((eGPUStencilTest)state.stencil_test, (eGPUStencilOp)state.stencil_op);
+ set_stencil_mask((eGPUStencilTest)state.stencil_test, mutable_state);
}
if (changed.clip_distances != 0) {
set_clip_distances(state.clip_distances, current_.clip_distances);
}
if (changed.culling_test != 0) {
- set_backface_culling(state.culling_test);
+ set_backface_culling((eGPUFaceCullTest)state.culling_test);
}
if (changed.logic_op_xor != 0) {
set_logic_op(state.logic_op_xor);
@@ -90,7 +90,7 @@ void GLStateManager::set_state(const GPUState &state)
set_facing(state.invert_facing);
}
if (changed.provoking_vert != 0) {
- set_provoking_vert(state.provoking_vert);
+ set_provoking_vert((eGPUProvokingVertex)state.provoking_vert);
}
if (changed.shadow_bias != 0) {
set_shadow_bias(state.shadow_bias);
@@ -160,7 +160,7 @@ void GLStateManager::set_mutable_state(const GPUStateMutable &state)
if (changed.stencil_compare_mask != 0 || changed.stencil_reference != 0 ||
changed.stencil_write_mask != 0) {
- set_stencil_mask(current_.stencil_test, state);
+ set_stencil_mask((eGPUStencilTest)current_.stencil_test, state);
}
current_mutable_ = state;