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-07-16 04:31:25 +0300
committerClément Foucault <foucault.clem@gmail.com>2020-07-16 19:01:44 +0300
commit436d38bb548d904200337d58720552b6f78555cb (patch)
tree57cd4e5978a0c0a60e2559642cc39b224333d0a2 /source/blender/gpu
parent3481f6eaf290b45025f66e5205530649502f351f (diff)
Cleanup: GPU: Move XOR logic op to gpu_state.c
Diffstat (limited to 'source/blender/gpu')
-rw-r--r--source/blender/gpu/GPU_state.h2
-rw-r--r--source/blender/gpu/intern/gpu_state.c5
2 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/gpu/GPU_state.h b/source/blender/gpu/GPU_state.h
index 4daf3f8dba5..6c0c4897fef 100644
--- a/source/blender/gpu/GPU_state.h
+++ b/source/blender/gpu/GPU_state.h
@@ -69,7 +69,7 @@ void GPU_viewport_size_get_i(int coords[4]);
void GPU_flush(void);
void GPU_finish(void);
-void GPU_logic_op_invert_set(bool enable);
+void GPU_logic_op_xor_set(bool enable);
/* Attribute push & pop. */
typedef enum eGPUAttrMask {
diff --git a/source/blender/gpu/intern/gpu_state.c b/source/blender/gpu/intern/gpu_state.c
index 8a9fbac08a3..65acd5a7771 100644
--- a/source/blender/gpu/intern/gpu_state.c
+++ b/source/blender/gpu/intern/gpu_state.c
@@ -181,14 +181,13 @@ void GPU_finish(void)
glFinish();
}
-void GPU_logic_op_invert_set(bool enable)
+void GPU_logic_op_xor_set(bool enable)
{
if (enable) {
- glLogicOp(GL_INVERT);
+ glLogicOp(GL_XOR);
glEnable(GL_COLOR_LOGIC_OP);
}
else {
- glLogicOp(GL_COPY);
glDisable(GL_COLOR_LOGIC_OP);
}
}