griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

DRW: Make tests pass

Browse Source 
These were just changes that changed the test
output but not the behavior.
This commit is contained in:
Clément Foucault
2023-07-26 12:04:21 +02:00
parent ad2771878d
commit 38542ceeda
2 changed files with 37 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
source/blender/draw/tests/draw_pass_test.cc
View File

@@ -77,8 +77,8 @@ static void test_draw_pass_all_commands()
<< " .stencil_set(write_mask=0b10000000, reference=0b00001111, compare_mask=0b10001111)"
<< 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_texture(0, sampler=internal)" << std::endl;
expected << " .bind_texture_ref(0, sampler=internal)" << std::endl;
expected << " .bind_image(-1)" << std::endl;
expected << " .bind_image_ref(-1)" << std::endl;
expected << " .bind_uniform_buf(-1)" << std::endl;
@@ -92,17 +92,17 @@ static void test_draw_pass_all_commands()
expected << " .push_constant(2, data=(1, 1, 1, 0))" << std::endl;
expected << " .push_constant(2, data=(1, 1, 1, 1))" << std::endl;
expected << " .push_constant(0, data=(" << std::endl;
expected << "( 1.000000, 0.000000, 0.000000, 0.000000)" << std::endl;
expected << "( 0.000000, 1.000000, 0.000000, 0.000000)" << std::endl;
expected << "( 0.000000, 0.000000, 1.000000, 0.000000)" << std::endl;
expected << "( 0.000000, 0.000000, 0.000000, 1.000000)" << std::endl;
expected << "(1, 0, 0, 0)," << std::endl;
expected << "(0, 1, 0, 0)," << std::endl;
expected << "(0, 0, 1, 0)," << std::endl;
expected << "(0, 0, 0, 1)" << std::endl;
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_color)" << std::endl;
expected << " .dispatch(1, 1, 1)" << std::endl;
expected << " .dispatch_ref(2, 2, 2)" << std::endl;
expected << " .barrier(4)" << std::endl;
expected << " .barrier(2)" << std::endl;
EXPECT_EQ(result, expected.str());
@@ -211,7 +211,7 @@ static void test_draw_pass_multi_draw()
std::stringstream expected;
expected << ".test.multi_draw" << std::endl;
expected << " .shader_bind(gpu_shader_3D_image_color)" << std::endl;
expected << " .draw_multi(3)" << std::endl;
expected << " .draw_multi(5)" << std::endl;
expected << " .group(id=4, len=2)" << std::endl;
expected << " .proto(instance_len=2, resource_id=8, front_face)" << std::endl;
expected << " .group(id=3, len=2)" << std::endl;
@@ -399,47 +399,47 @@ static void test_draw_manager_sync()
std::stringstream expected;
expected << "ObjectMatrices(" << std::endl;
expected << "model=(" << std::endl;
expected << "( 1.000000, 0.000000, 0.000000, 0.000000)" << std::endl;
expected << "( 0.000000, 1.000000, 0.000000, 0.000000)" << std::endl;
expected << "( 0.000000, 0.000000, 1.000000, 0.000000)" << std::endl;
expected << "( 0.000000, 0.000000, 0.000000, 1.000000)" << std::endl;
expected << "(1, 0, 0, 0)," << std::endl;
expected << "(0, 1, 0, 0)," << std::endl;
expected << "(0, 0, 1, 0)," << std::endl;
expected << "(0, 0, 0, 1)" << std::endl;
expected << ")" << std::endl;
expected << ", " << std::endl;
expected << "model_inverse=(" << std::endl;
expected << "( 1.000000, -0.000000, 0.000000, -0.000000)" << std::endl;
expected << "( -0.000000, 1.000000, -0.000000, 0.000000)" << std::endl;
expected << "( 0.000000, -0.000000, 1.000000, -0.000000)" << std::endl;
expected << "( -0.000000, 0.000000, -0.000000, 1.000000)" << std::endl;
expected << "(1, -0, 0, -0)," << std::endl;
expected << "(-0, 1, -0, 0)," << std::endl;
expected << "(0, -0, 1, -0)," << std::endl;
expected << "(-0, 0, -0, 1)" << std::endl;
expected << ")" << std::endl;
expected << ")" << std::endl;
expected << "ObjectMatrices(" << std::endl;
expected << "model=(" << std::endl;
expected << "( -0.500000, -0.000000, -0.000000, 0.000000)" << std::endl;
expected << "( -0.000000, -0.500000, -0.000000, 0.000000)" << std::endl;
expected << "( -0.000000, -0.000000, -0.500000, 0.000000)" << std::endl;
expected << "( 0.000000, 0.000000, 0.000000, 1.000000)" << std::endl;
expected << "(-0.5, 0, 0, 0)," << std::endl;
expected << "(0, -0.5, 0, 0)," << std::endl;
expected << "(0, 0, -0.5, 0)," << std::endl;
expected << "(0, 0, 0, 1)" << std::endl;
expected << ")" << std::endl;
expected << ", " << std::endl;
expected << "model_inverse=(" << std::endl;
expected << "( -2.000000, 0.000000, -0.000000, -0.000000)" << std::endl;
expected << "( 0.000000, -2.000000, 0.000000, 0.000000)" << std::endl;
expected << "( -0.000000, 0.000000, -2.000000, 0.000000)" << std::endl;
expected << "( -0.000000, -0.000000, 0.000000, 1.000000)" << std::endl;
expected << "(-2, -0, -0, 0)," << std::endl;
expected << "(-0, -2, 0, -0)," << std::endl;
expected << "(-0, 0, -2, 0)," << std::endl;
expected << "(0, -0, 0, 1)" << std::endl;
expected << ")" << std::endl;
expected << ")" << std::endl;
expected << "ObjectMatrices(" << std::endl;
expected << "model=(" << std::endl;
expected << "( 0.500000, 0.000000, 0.000000, 0.000000)" << std::endl;
expected << "( 0.000000, 0.500000, 0.000000, 0.000000)" << std::endl;
expected << "( 0.000000, 0.000000, 0.500000, 0.000000)" << std::endl;
expected << "( 0.000000, 0.000000, 0.000000, 1.000000)" << std::endl;
expected << "(0.5, 0, 0, 0)," << std::endl;
expected << "(0, 0.5, 0, 0)," << std::endl;
expected << "(0, 0, 0.5, 0)," << std::endl;
expected << "(0, 0, 0, 1)" << std::endl;
expected << ")" << std::endl;
expected << ", " << std::endl;
expected << "model_inverse=(" << std::endl;
expected << "( 2.000000, -0.000000, 0.000000, -0.000000)" << std::endl;
expected << "( -0.000000, 2.000000, -0.000000, 0.000000)" << std::endl;
expected << "( 0.000000, -0.000000, 2.000000, -0.000000)" << std::endl;
expected << "( -0.000000, 0.000000, -0.000000, 1.000000)" << std::endl;
expected << "(2, -0, 0, -0)," << std::endl;
expected << "(-0, 2, -0, 0)," << std::endl;
expected << "(0, -0, 2, -0)," << std::endl;
expected << "(-0, 0, -0, 1)" << std::endl;
expected << ")" << std::endl;
expected << ")" << std::endl;
expected << "ObjectBounds(skipped)" << std::endl;

11
source/blender/draw/tests/eevee_test.cc
View File

@@ -1258,10 +1258,6 @@ static void test_eevee_surfel_list()
list_start_buf.read();
surfel_buf.read();
/* NOTE: All of these are unstable by definition (atomic + multi-thread).
* But should be consistent since we only dispatch one thread-group. */
/* Expect last added surfel index. It is the list start index before sorting. */
Vector<int> expect_list_start = {-1, 3, 5, 4};
/* Expect surfel list. */
Vector<int> expect_link_next = {-1, +2, +3, +0, -1, -1};
Vector<int> expect_link_prev = {+3, -1, +1, +2, -1, -1};
@@ -1273,12 +1269,15 @@ static void test_eevee_surfel_list()
}
#if 0 /* Useful for debugging */
/* NOTE: All of these are unstable by definition (atomic + multi-thread).
* But should be consistent since we only dispatch one thread-group. */
/* Expect last added surfel index. It is the list start index before sorting. */
Vector<int> expect_list_start = {-1, 3, 5, 4};
// Span<int>(list_start_buf.data(), expect_list_start.size()).print_as_lines("list_start");
// link_next.as_span().print_as_lines("link_next");
// link_prev.as_span().print_as_lines("link_prev");
#endif
EXPECT_EQ_ARRAY(list_start_buf.data(), expect_list_start.data(), expect_list_start.size());
#endif
EXPECT_EQ_ARRAY(link_next.data(), expect_link_next.data(), expect_link_next.size());
EXPECT_EQ_ARRAY(link_prev.data(), expect_link_prev.data(), expect_link_prev.size());