[Bf-blender-cvs] [0b3caae8a70] tmp-vulkan: Merge commit 'master@{1-day-ago}' into tmp-vulkan

[Jeroen Bakker]

Commit: 0b3caae8a70a9bd66557011f8f666e9684e6c75c
Author: Jeroen Bakker
Date:   Mon Jun 28 15:17:51 2021 +0200
Branches: tmp-vulkan
https://developer.blender.org/rB0b3caae8a70a9bd66557011f8f666e9684e6c75c

Merge commit 'master@{1-day-ago}' into tmp-vulkan

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



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

diff --cc source/blender/draw/tests/shaders_test.cc
index 4befb5d7846,cce69714f5e..194d63c346e
--- a/source/blender/draw/tests/shaders_test.cc
+++ b/source/blender/draw/tests/shaders_test.cc
@@@ -390,58 -371,20 +395,74 @@@ static void test_eevee_glsl_shaders(
    EEVEE_shaders_free();
  }
  
+ static void test_draw_shaders(eParticleRefineShaderType sh_type)
+ {
+   DRW_shaders_free();
+   EXPECT_NE(DRW_shader_hair_refine_get(PART_REFINE_CATMULL_ROM, sh_type), nullptr);
+   DRW_shaders_free();
+ }
+ 
 -TEST_F(DrawTest, draw_glsl_shaders)
++TEST_F(DrawOpenGLTest, draw_glsl_shaders)
+ {
+ #ifndef __APPLE__
+   test_draw_shaders(PART_REFINE_SHADER_TRANSFORM_FEEDBACK);
+   test_draw_shaders(PART_REFINE_SHADER_COMPUTE);
+ #endif
+   test_draw_shaders(PART_REFINE_SHADER_TRANSFORM_FEEDBACK_WORKAROUND);
+ }
+ 
 +TEST_F(DrawOpenGLTest, workbench_glsl_shaders)
 +{
 +  test_workbench_glsl_shaders();
 +}
 +
 +TEST_F(DrawOpenGLTest, gpencil_glsl_shaders)
 +{
 +  test_gpencil_glsl_shaders();
 +}
 +
 +TEST_F(DrawOpenGLTest, image_glsl_shaders)
 +{
 +  test_image_glsl_shaders();
 +}
 +
 +TEST_F(DrawOpenGLTest, overlay_glsl_shaders)
 +{
 +  test_overlay_glsl_shaders();
 +}
 +
 +TEST_F(DrawOpenGLTest, eevee_glsl_shaders_static)
 +{
 +  test_eevee_glsl_shaders();
 +}
 +
 +#ifdef WITH_VULKAN
 +
 +TEST_F(DrawVulkanTest, workbench_glsl_shaders)
 +{
 +  test_workbench_glsl_shaders();
 +}
 +
 +TEST_F(DrawVulkanTest, gpencil_glsl_shaders)
 +{
 +  test_gpencil_glsl_shaders();
 +}
 +
 +TEST_F(DrawVulkanTest, image_glsl_shaders)
 +{
 +  test_image_glsl_shaders();
 +}
 +
 +TEST_F(DrawVulkanTest, overlay_glsl_shaders)
 +{
 +  test_overlay_glsl_shaders();
 +}
 +
 +TEST_F(DrawVulkanTest, eevee_glsl_shaders_static)
 +{
 +  test_eevee_glsl_shaders();
 +}
 +
 +#endif
 +
  }  // namespace blender::draw