isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-01-23 09:59:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests/cogl: Remove unused legacy_mode

Browse Source 
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3553>
This commit is contained in:
Bilal Elmoussaoui 2024-02-15 08:12:09 +01:00
parent 2c613df4eb
commit ab1322781d
1 changed files with 15 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/tests/cogl/conform/test-depth-test.c
View File

@ -37,8 +37,7 @@ static gboolean
draw_rectangle (TestState *state, draw_rectangle (TestState *state,
int x, int x,
int y, int y,
TestDepthState *rect_state, TestDepthState *rect_state)
gboolean legacy_mode)
{ {
uint8_t Cr = MASK_RED (rect_state->color); uint8_t Cr = MASK_RED (rect_state->color);
uint8_t Cg = MASK_GREEN (rect_state->color); uint8_t Cg = MASK_GREEN (rect_state->color);
@ -68,38 +67,17 @@ draw_rectangle (TestState *state,
Cb / 255.0, Ca / 255.0); Cb / 255.0, Ca / 255.0);
cogl_pipeline_set_color (pipeline, &color); cogl_pipeline_set_color (pipeline, &color);
if (!legacy_mode) cogl_framebuffer_set_depth_write_enabled (test_fb,
{ rect_state->fb_write_enable);
cogl_framebuffer_set_depth_write_enabled (test_fb, cogl_framebuffer_push_matrix (test_fb);
rect_state->fb_write_enable); cogl_framebuffer_translate (test_fb, 0, 0, rect_state->depth);
cogl_framebuffer_push_matrix (test_fb); cogl_framebuffer_draw_rectangle (test_fb,
cogl_framebuffer_translate (test_fb, 0, 0, rect_state->depth); pipeline,
cogl_framebuffer_draw_rectangle (test_fb, x * QUAD_WIDTH,
pipeline, y * QUAD_WIDTH,
x * QUAD_WIDTH, x * QUAD_WIDTH + QUAD_WIDTH,
y * QUAD_WIDTH, y * QUAD_WIDTH + QUAD_WIDTH);
x * QUAD_WIDTH + QUAD_WIDTH, cogl_framebuffer_pop_matrix (test_fb);
y * QUAD_WIDTH + QUAD_WIDTH);
cogl_framebuffer_pop_matrix (test_fb);
}
else
{
CoglPipeline *legacy_pipeline;
legacy_pipeline = cogl_pipeline_new (test_ctx);
cogl_framebuffer_push_matrix (test_fb);
cogl_framebuffer_translate (test_fb, 0, 0, rect_state->depth);
cogl_framebuffer_draw_rectangle (test_fb,
pipeline,
x * QUAD_WIDTH,
y * QUAD_WIDTH,
x * QUAD_WIDTH + QUAD_WIDTH,
y * QUAD_WIDTH + QUAD_WIDTH);
cogl_framebuffer_pop_matrix (test_fb);
g_object_unref (legacy_pipeline);
}
g_object_unref (pipeline); g_object_unref (pipeline);
@ -113,17 +91,16 @@ test_depth (TestState *state,
TestDepthState *rect0_state, TestDepthState *rect0_state,
TestDepthState *rect1_state, TestDepthState *rect1_state,
TestDepthState *rect2_state, TestDepthState *rect2_state,
gboolean legacy_mode,
uint32_t expected_result) uint32_t expected_result)
{ {
gboolean missing_feature = FALSE; gboolean missing_feature = FALSE;
if (rect0_state) if (rect0_state)
missing_feature |= !draw_rectangle (state, x, y, rect0_state, legacy_mode); missing_feature |= !draw_rectangle (state, x, y, rect0_state);
if (rect1_state) if (rect1_state)
missing_feature |= !draw_rectangle (state, x, y, rect1_state, legacy_mode); missing_feature |= !draw_rectangle (state, x, y, rect1_state);
if (rect2_state) if (rect2_state)
missing_feature |= !draw_rectangle (state, x, y, rect2_state, legacy_mode); missing_feature |= !draw_rectangle (state, x, y, rect2_state);
/* We don't consider it an error that we can't test something /* We don't consider it an error that we can't test something
* the driver doesn't support. */ * the driver doesn't support. */
@ -176,39 +153,33 @@ paint (TestState *state)
test_depth (state, 0, 0, /* position */ test_depth (state, 0, 0, /* position */
&rect0_state, &rect1_state, &rect2_state, &rect0_state, &rect1_state, &rect2_state,
FALSE, /* legacy mode */
0x00ff00ff); /* expected */ 0x00ff00ff); /* expected */
rect2_state.test_function = COGL_DEPTH_TEST_FUNCTION_ALWAYS; rect2_state.test_function = COGL_DEPTH_TEST_FUNCTION_ALWAYS;
test_depth (state, 1, 0, /* position */ test_depth (state, 1, 0, /* position */
&rect0_state, &rect1_state, &rect2_state, &rect0_state, &rect1_state, &rect2_state,
FALSE, /* legacy mode */
0x0000ffff); /* expected */ 0x0000ffff); /* expected */
rect2_state.test_function = COGL_DEPTH_TEST_FUNCTION_LESS; rect2_state.test_function = COGL_DEPTH_TEST_FUNCTION_LESS;
test_depth (state, 2, 0, /* position */ test_depth (state, 2, 0, /* position */
&rect0_state, &rect1_state, &rect2_state, &rect0_state, &rect1_state, &rect2_state,
FALSE, /* legacy mode */
0x0000ffff); /* expected */ 0x0000ffff); /* expected */
rect2_state.test_function = COGL_DEPTH_TEST_FUNCTION_GREATER; rect2_state.test_function = COGL_DEPTH_TEST_FUNCTION_GREATER;
test_depth (state, 3, 0, /* position */ test_depth (state, 3, 0, /* position */
&rect0_state, &rect1_state, &rect2_state, &rect0_state, &rect1_state, &rect2_state,
FALSE, /* legacy mode */
0x00ff00ff); /* expected */ 0x00ff00ff); /* expected */
rect0_state.test_enable = TRUE; rect0_state.test_enable = TRUE;
rect1_state.write_enable = FALSE; rect1_state.write_enable = FALSE;
test_depth (state, 4, 0, /* position */ test_depth (state, 4, 0, /* position */
&rect0_state, &rect1_state, &rect2_state, &rect0_state, &rect1_state, &rect2_state,
FALSE, /* legacy mode */
0x0000ffff); /* expected */ 0x0000ffff); /* expected */
rect1_state.write_enable = TRUE; rect1_state.write_enable = TRUE;
rect1_state.fb_write_enable = FALSE; rect1_state.fb_write_enable = FALSE;
test_depth (state, 4, 0, /* position */ test_depth (state, 4, 0, /* position */
&rect0_state, &rect1_state, &rect2_state, &rect0_state, &rect1_state, &rect2_state,
FALSE, /* legacy mode */
0x0000ffff); /* expected */ 0x0000ffff); /* expected */
/* Re-enable FB depth writing to verify state flush */ /* Re-enable FB depth writing to verify state flush */
@ -216,7 +187,6 @@ paint (TestState *state)
rect1_state.fb_write_enable = TRUE; rect1_state.fb_write_enable = TRUE;
test_depth (state, 4, 0, /* position */ test_depth (state, 4, 0, /* position */
&rect0_state, &rect1_state, &rect2_state, &rect0_state, &rect1_state, &rect2_state,
FALSE, /* legacy mode */
0x00ff00ff); /* expected */ 0x00ff00ff); /* expected */
} }
@ -247,7 +217,6 @@ paint (TestState *state)
test_depth (state, 0, 1, /* position */ test_depth (state, 0, 1, /* position */
&rect0_state, &rect1_state, NULL, &rect0_state, &rect1_state, NULL,
FALSE, /* legacy mode */
0xff0000ff); /* expected */ 0xff0000ff); /* expected */
} }
} }