isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-26 10:00:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

test-just-vertex-shader: Sample a texture in the fragment pipeline

Browse Source 
Previously the layer combine on the test pipeline was set up to
replace the incoming color with the layer constant. This patch changes
it to sample the replacement color from a 1x1 texture instead. This
exposes a bug on the GLES2 backend where the vertex shader will be
generated with a size for cogl_tex_coord_out of 4 but the
corresponding declaration in the fragment shader will have n_layers,
which is 1. This makes the program fail to link and the test fails.

https://bugzilla.gnome.org/show_bug.cgi?id=662184

Reviewed-by: Robert Bragg <robert@linux.intel.com>
This commit is contained in:
Neil Roberts 2011-10-19 11:04:51 +01:00
parent 757916f17a
commit 884647071c
1 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
tests/conform/test-just-vertex-shader.c
View File

@ -9,10 +9,26 @@ typedef struct _TestState
int dummy; int dummy;
} TestState; } TestState;
static CoglHandle
create_dummy_texture (void)
{
/* Create a dummy 1x1 green texture to replace the color from the
vertex shader */
static const guint8 data[4] = { 0x00, 0xff, 0x00, 0xff };
return cogl_texture_new_from_data (1, 1, /* size */
COGL_TEXTURE_NONE,
COGL_PIXEL_FORMAT_RGB_888,
COGL_PIXEL_FORMAT_ANY,
4, /* rowstride */
data);
}
static void static void
paint_legacy (TestState *state) paint_legacy (TestState *state)
{ {
CoglHandle material = cogl_material_new (); CoglHandle material = cogl_material_new ();
CoglHandle tex;
CoglColor color; CoglColor color;
GError *error = NULL; GError *error = NULL;
CoglHandle shader, program; CoglHandle shader, program;
@ -25,14 +41,15 @@ paint_legacy (TestState *state)
cogl_material_set_color (material, &color); cogl_material_set_color (material, &color);
/* Override the vertex color in the texture environment with a /* Override the vertex color in the texture environment with a
constant green color */ constant green color provided by a texture */
cogl_color_set_from_4ub (&color, 0x00, 0xff, 0x00, 0xff); tex = create_dummy_texture ();
cogl_material_set_layer_combine_constant (material, 0, &color); cogl_material_set_layer (material, 0, tex);
cogl_handle_unref (tex);
if (!cogl_material_set_layer_combine (material, 0, if (!cogl_material_set_layer_combine (material, 0,
"RGBA=REPLACE(CONSTANT)", "RGBA=REPLACE(TEXTURE)",
&error)) &error))
{ {
g_warning ("Error setting blend constant: %s", error->message); g_warning ("Error setting layer combine: %s", error->message);
g_assert_not_reached (); g_assert_not_reached ();
} }
@ -47,6 +64,7 @@ paint_legacy (TestState *state)
"cogl_modelview_projection_matrix * " "cogl_modelview_projection_matrix * "
"cogl_position_in;\n" "cogl_position_in;\n"
" cogl_color_out = cogl_color_in;\n" " cogl_color_out = cogl_color_in;\n"
" cogl_tex_coord_out[0] = cogl_tex_coord_in;\n"
"}\n"); "}\n");
cogl_shader_compile (shader); cogl_shader_compile (shader);
if (!cogl_shader_is_compiled (shader)) if (!cogl_shader_is_compiled (shader))
@ -80,6 +98,7 @@ static void
paint (TestState *state) paint (TestState *state)
{ {
CoglPipeline *pipeline = cogl_pipeline_new (); CoglPipeline *pipeline = cogl_pipeline_new ();
CoglHandle tex;
CoglColor color; CoglColor color;
GError *error = NULL; GError *error = NULL;
CoglHandle shader, program; CoglHandle shader, program;
@ -92,14 +111,15 @@ paint (TestState *state)
cogl_pipeline_set_color (pipeline, &color); cogl_pipeline_set_color (pipeline, &color);
/* Override the vertex color in the texture environment with a /* Override the vertex color in the texture environment with a
constant green color */ constant green color provided by a texture */
cogl_color_set_from_4ub (&color, 0x00, 0xff, 0x00, 0xff); tex = create_dummy_texture ();
cogl_pipeline_set_layer_combine_constant (pipeline, 0, &color); cogl_pipeline_set_layer_texture (pipeline, 0, tex);
cogl_handle_unref (tex);
if (!cogl_pipeline_set_layer_combine (pipeline, 0, if (!cogl_pipeline_set_layer_combine (pipeline, 0,
"RGBA=REPLACE(CONSTANT)", "RGBA=REPLACE(TEXTURE)",
&error)) &error))
{ {
g_warning ("Error setting blend constant: %s", error->message); g_warning ("Error setting layer combine: %s", error->message);
g_assert_not_reached (); g_assert_not_reached ();
} }
@ -114,6 +134,7 @@ paint (TestState *state)
"cogl_modelview_projection_matrix * " "cogl_modelview_projection_matrix * "
"cogl_position_in;\n" "cogl_position_in;\n"
" cogl_color_out = cogl_color_in;\n" " cogl_color_out = cogl_color_in;\n"
" cogl_tex_coord_out[0] = cogl_tex_coord_in;\n"
"}\n"); "}\n");
cogl_shader_compile (shader); cogl_shader_compile (shader);
if (!cogl_shader_is_compiled (shader)) if (!cogl_shader_is_compiled (shader))