Update DRW tests

And remove retest of `GPU_SHADER_3D_LINE_DASHED_UNIFORM_COLOR`.

2 files changed, 10 insertions, 11 deletions

diff --git a/source/blender/draw/tests/draw_pass_test.cc b/source/blender/draw/tests/draw_pass_test.cc
index 8f2f87a18f6..4ab32113388 100644
--- a/source/blender/draw/tests/draw_pass_test.cc
+++ b/source/blender/draw/tests/draw_pass_test.cc
@@ -22,7 +22,7 @@ static void test_draw_pass_all_commands()
   StorageBuffer<uint4> ssbo;
   ssbo.push_update();
 
-  float alpha = 0.0f;
+  float color[] = {1.0f, 1.0f, 1.0f, 0.0f};
   int3 dispatch_size(1);
 
   PassSimple pass = {"test.all_commands"};
@@ -39,8 +39,8 @@ static void test_draw_pass_all_commands()
   pass.bind_ubo("missing_ubo", &ubo);     /* Should not crash. */
   pass.bind_ssbo("missing_ssbo", ssbo);   /* Should not crash. */
   pass.bind_ssbo("missing_ssbo", &ssbo);  /* Should not crash. */
-  pass.push_constant("alpha", alpha);
-  pass.push_constant("alpha", &alpha);
+  pass.push_constant("color", color);
+  pass.push_constant("color", &color);
   pass.push_constant("ModelViewProjectionMatrix", float4x4::identity());
   pass.draw_procedural(GPU_PRIM_TRIS, 1, 3);
 
@@ -52,7 +52,7 @@ static void test_draw_pass_all_commands()
   pass.barrier(GPU_BARRIER_SHADER_IMAGE_ACCESS);
 
   /* Change references. */
-  alpha = 1.0f;
+  color[3] = 1.0f;
   dispatch_size = int3(2);
 
   std::string result = pass.serialize();
@@ -63,7 +63,7 @@ static void test_draw_pass_all_commands()
            << std::endl;
   expected << "  .stencil_set(write_mask=0b10000000, compare_mask=0b00001111, reference=0b10001111"
            << std::endl;
-  expected << "  .shader_bind(gpu_shader_3D_image_modulate_alpha)" << std::endl;
+  expected << "  .shader_bind(gpu_shader_3D_image_color)" << std::endl;
   expected << "  .bind_texture(0)" << std::endl;
   expected << "  .bind_texture_ref(0)" << std::endl;
   expected << "  .bind_image(-1)" << std::endl;
@@ -82,7 +82,7 @@ static void test_draw_pass_all_commands()
   expected << ")" << std::endl;
   expected << ")" << std::endl;
   expected << "  .draw(inst_len=1, vert_len=3, vert_first=0, res_id=0)" << std::endl;
-  expected << "  .shader_bind(gpu_shader_3D_image_modulate_alpha)" << std::endl;
+  expected << "  .shader_bind(gpu_shader_3D_image_color)" << std::endl;
   expected << "  .dispatch(1, 1, 1)" << std::endl;
   expected << "  .dispatch_ref(2, 2, 2)" << std::endl;
   expected << "  .barrier(4)" << std::endl;
@@ -121,7 +121,7 @@ static void test_draw_pass_sub_ordering()
   std::string result = pass.serialize();
   std::stringstream expected;
   expected << ".test.sub_ordering" << std::endl;
-  expected << "  .shader_bind(gpu_shader_3D_image_modulate_alpha)" << std::endl;
+  expected << "  .shader_bind(gpu_shader_3D_image_color)" << std::endl;
   expected << "  .push_constant(-1, data=1)" << std::endl;
   expected << "  .Sub1" << std::endl;
   expected << "    .push_constant(-1, data=11)" << std::endl;
@@ -153,7 +153,7 @@ static void test_draw_pass_simple_draw()
   std::string result = pass.serialize();
   std::stringstream expected;
   expected << ".test.simple_draw" << std::endl;
-  expected << "  .shader_bind(gpu_shader_3D_image_modulate_alpha)" << std::endl;
+  expected << "  .shader_bind(gpu_shader_3D_image_color)" << std::endl;
   expected << "  .draw(inst_len=1, vert_len=10, vert_first=1, res_id=1)" << std::endl;
   expected << "  .draw(inst_len=4, vert_len=20, vert_first=2, res_id=2)" << std::endl;
   expected << "  .draw(inst_len=2, vert_len=30, vert_first=3, res_id=3)" << std::endl;
@@ -185,7 +185,7 @@ static void test_draw_pass_multi_draw()
   std::string result = pass.serialize();
   std::stringstream expected;
   expected << ".test.multi_draw" << std::endl;
-  expected << "  .shader_bind(gpu_shader_3D_image_modulate_alpha)" << std::endl;
+  expected << "  .shader_bind(gpu_shader_3D_image_color)" << std::endl;
   expected << "  .draw_multi(3)" << std::endl;
   expected << "    .group(id=2, len=1)" << std::endl;
   expected << "      .proto(instance_len=1, resource_id=5, front_face)" << std::endl;
@@ -438,4 +438,4 @@ static void test_draw_manager_sync()
 }
 DRAW_TEST(draw_manager_sync)
 
-}  // namespace blender::draw
\ No newline at end of file
+}  // namespace blender::draw
diff --git a/source/blender/gpu/tests/gpu_shader_builtin_test.cc b/source/blender/gpu/tests/gpu_shader_builtin_test.cc
index b8263a8c399..567f1370f00 100644
--- a/source/blender/gpu/tests/gpu_shader_builtin_test.cc
+++ b/source/blender/gpu/tests/gpu_shader_builtin_test.cc
@@ -56,7 +56,6 @@ static void test_shader_builtin()
                               GPU_SHADER_CFG_DEFAULT);
   test_compile_builtin_shader(GPU_SHADER_3D_POINT_VARYING_SIZE_VARYING_COLOR,
                               GPU_SHADER_CFG_DEFAULT);
-  test_compile_builtin_shader(GPU_SHADER_3D_LINE_DASHED_UNIFORM_COLOR, GPU_SHADER_CFG_DEFAULT);
   test_compile_builtin_shader(GPU_SHADER_GPENCIL_STROKE, GPU_SHADER_CFG_DEFAULT);
   test_compile_builtin_shader(GPU_SHADER_2D_AREA_BORDERS, GPU_SHADER_CFG_DEFAULT);
   test_compile_builtin_shader(GPU_SHADER_2D_WIDGET_BASE, GPU_SHADER_CFG_DEFAULT);