GPUState: Use explicit depth test enum

4 files changed, 13 insertions, 14 deletions

diff --git a/source/blender/gpu/GPU_state.h b/source/blender/gpu/GPU_state.h
index be3250f6654..6a59baa38f0 100644
--- a/source/blender/gpu/GPU_state.h
+++ b/source/blender/gpu/GPU_state.h
@@ -66,9 +66,9 @@ typedef enum eGPUBlend {
 
 typedef enum eGPUDepthTest {
   GPU_DEPTH_NONE = 0,
-  GPU_DEPTH_ALWAYS,
+  GPU_DEPTH_ALWAYS, /* Used to draw to the depth buffer without really testing. */
   GPU_DEPTH_LESS,
-  GPU_DEPTH_LESS_EQUAL,
+  GPU_DEPTH_LESS_EQUAL, /* Default. */
   GPU_DEPTH_EQUAL,
   GPU_DEPTH_GREATER,
   GPU_DEPTH_GREATER_EQUAL,
@@ -106,11 +106,10 @@ extern "C" {
 
 void GPU_blend(eGPUBlend blend);
 void GPU_face_culling(eGPUFaceCullTest culling);
-void GPU_front_facing(bool invert);
+void GPU_depth_test(eGPUDepthTest test);
 void GPU_provoking_vertex(eGPUProvokingVertex vert);
+void GPU_front_facing(bool invert);
 void GPU_depth_range(float near, float far);
-void GPU_depth_test(bool enable);
-bool GPU_depth_test_enabled(void);
 void GPU_scissor_test(bool enable);
 void GPU_line_smooth(bool enable);
 void GPU_line_width(float width);
@@ -144,6 +143,7 @@ void GPU_stencil_write_mask_set(uint write_mask);
 void GPU_stencil_compare_mask_set(uint compare_mask);
 
 eGPUBlend GPU_blend_get(void);
+eGPUDepthTest GPU_depth_test_get(void);
 eGPUWriteMask GPU_write_mask_get(void);
 
 void GPU_flush(void);
diff --git a/source/blender/gpu/intern/gpu_select_pick.c b/source/blender/gpu/intern/gpu_select_pick.c
index 29e2615345c..c1a91490f5e 100644
--- a/source/blender/gpu/intern/gpu_select_pick.c
+++ b/source/blender/gpu/intern/gpu_select_pick.c
@@ -287,7 +287,7 @@ typedef struct GPUPickState {
   int viewport[4];
   int scissor[4];
   eGPUWriteMask write_mask;
-  bool depth_test;
+  eGPUDepthTest depth_test;
 } GPUPickState;
 
 static GPUPickState g_pick_state = {0};
@@ -311,7 +311,7 @@ void gpu_select_pick_begin(uint (*buffer)[4], uint bufsize, const rcti *input, c
   /* Restrict OpenGL operations for when we don't have cache */
   if (ps->is_cached == false) {
     ps->write_mask = GPU_write_mask_get();
-    ps->depth_test = GPU_depth_test_enabled();
+    ps->depth_test = GPU_depth_test_get();
     GPU_scissor_get(ps->scissor);
 
     /* disable writing to the framebuffer */
diff --git a/source/blender/gpu/intern/gpu_select_sample_query.c b/source/blender/gpu/intern/gpu_select_sample_query.c
index 62414febb44..334f4ba927a 100644
--- a/source/blender/gpu/intern/gpu_select_sample_query.c
+++ b/source/blender/gpu/intern/gpu_select_sample_query.c
@@ -65,7 +65,7 @@ typedef struct GPUQueryState {
   int viewport[4];
   int scissor[4];
   eGPUWriteMask write_mask;
-  bool depth_test;
+  eGPUDepthTest depth_test;
 } GPUQueryState;
 
 static GPUQueryState g_query_state = {0};
@@ -91,7 +91,7 @@ void gpu_select_query_begin(
   glGenQueries(g_query_state.num_of_queries, g_query_state.queries);
 
   g_query_state.write_mask = GPU_write_mask_get();
-  g_query_state.depth_test = GPU_depth_test_enabled();
+  g_query_state.depth_test = GPU_depth_test_get();
   GPU_scissor_get(g_query_state.scissor);
 
   /* disable writing to the framebuffer */
diff --git a/source/blender/gpu/intern/gpu_state.cc b/source/blender/gpu/intern/gpu_state.cc
index 2c09773e8f5..1be3b06fa34 100644
--- a/source/blender/gpu/intern/gpu_state.cc
+++ b/source/blender/gpu/intern/gpu_state.cc
@@ -74,10 +74,9 @@ void GPU_provoking_vertex(eGPUProvokingVertex vert)
   SET_IMMUTABLE_STATE(provoking_vert, vert);
 }
 
-/* TODO explicit depth test. */
-void GPU_depth_test(bool enable)
+void GPU_depth_test(eGPUDepthTest test)
 {
-  SET_IMMUTABLE_STATE(depth_test, (enable) ? GPU_DEPTH_LESS_EQUAL : GPU_DEPTH_NONE);
+  SET_IMMUTABLE_STATE(depth_test, test);
 }
 
 void GPU_line_smooth(bool enable)
@@ -240,10 +239,10 @@ eGPUWriteMask GPU_write_mask_get()
   return (eGPUWriteMask)state.write_mask;
 }
 
-bool GPU_depth_test_enabled()
+eGPUDepthTest GPU_depth_test_get()
 {
   GPUState &state = GPU_context_active_get()->state_manager->state;
-  return state.depth_test != GPU_DEPTH_NONE;
+  return (eGPUDepthTest)state.depth_test;
 }
 
 void GPU_scissor_get(int coords[4])