[Bf-blender-cvs] [310ec06e60c] uvimage-editor-drawing: Added GLSL tests

[Jeroen Bakker]

Commit: 310ec06e60ce8802c3ac06ed3143f06a52f5a6bc
Author: Jeroen Bakker
Date:   Fri Aug 28 17:04:17 2020 +0200
Branches: uvimage-editor-drawing
https://developer.blender.org/rB310ec06e60ce8802c3ac06ed3143f06a52f5a6bc

Added GLSL tests

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

M       source/blender/draw/engines/image/image_private.h
M       source/blender/draw/tests/shaders_test.cc

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

diff --git a/source/blender/draw/engines/image/image_private.h 
b/source/blender/draw/engines/image/image_private.h
index f2e48c29fc1..d11d868d4d2 100644
--- a/source/blender/draw/engines/image/image_private.h
+++ b/source/blender/draw/engines/image/image_private.h
@@ -20,6 +20,10 @@
  * \ingroup draw_engine
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Forward declarations */
 struct rcti;
 struct GPUBatch;
@@ -57,6 +61,9 @@ typedef struct IMAGE_Data {
 
 /* image_shader.c */
 GPUShader *IMAGE_shader_image_get(void);
-GPUShader *IMAGE_shader_image_unavailable_get(void);
 void IMAGE_shader_library_ensure(void);
 void IMAGE_shader_free(void);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/draw/tests/shaders_test.cc 
b/source/blender/draw/tests/shaders_test.cc
index b2f1020ed98..261eac9f5c6 100644
--- a/source/blender/draw/tests/shaders_test.cc
+++ b/source/blender/draw/tests/shaders_test.cc
@@ -12,6 +12,7 @@
 
 #include "engines/eevee/eevee_private.h"
 #include "engines/gpencil/gpencil_engine.h"
+#include "engines/image/image_private.h"
 #include "engines/overlay/overlay_private.h"
 #include "engines/workbench/workbench_private.h"
 
@@ -166,8 +167,19 @@ TEST_F(DrawTest, gpencil_glsl_shaders)
   GPENCIL_shader_free();
 }
 
+TEST_F(DrawTest, image_glsl_shaders)
+{
+  IMAGE_shader_library_ensure();
+
+  EXPECT_NE(IMAGE_shader_image_get(), nullptr);
+
+  IMAGE_shader_free();
+}
+
 TEST_F(DrawTest, overlay_glsl_shaders)
 {
+  OVERLAY_shader_library_ensure();
+
   for (int i = 0; i < 2; i++) {
     eGPUShaderConfig sh_cfg = i == 0 ? GPU_SHADER_CFG_DEFAULT : 
GPU_SHADER_CFG_CLIPPED;
     DRW_draw_state_init_gtests(sh_cfg);
@@ -204,6 +216,13 @@ TEST_F(DrawTest, overlay_glsl_shaders)
     EXPECT_NE(OVERLAY_shader_edit_mesh_vert(), nullptr);
     EXPECT_NE(OVERLAY_shader_edit_particle_strand(), nullptr);
     EXPECT_NE(OVERLAY_shader_edit_particle_point(), nullptr);
+    EXPECT_NE(OVERLAY_shader_edit_uv_edges_get(), nullptr);
+    EXPECT_NE(OVERLAY_shader_edit_uv_face_get(), nullptr);
+    EXPECT_NE(OVERLAY_shader_edit_uv_face_dots_get(), nullptr);
+    EXPECT_NE(OVERLAY_shader_edit_uv_verts_get(), nullptr);
+    EXPECT_NE(OVERLAY_shader_edit_uv_stretching_area_get(), nullptr);
+    EXPECT_NE(OVERLAY_shader_edit_uv_stretching_angle_get(), nullptr);
+    EXPECT_NE(OVERLAY_shader_edit_uv_tiled_image_borders_get(), nullptr);
     EXPECT_NE(OVERLAY_shader_extra(false), nullptr);
     EXPECT_NE(OVERLAY_shader_extra(true), nullptr);
     EXPECT_NE(OVERLAY_shader_extra_groundline(), nullptr);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs