diff options
| -rw-r--r-- | tests/all.tests | 2 | ||||
| -rw-r--r-- | tests/spec/glsl-1.50/CMakeLists.gl.txt | 1 | ||||
| -rw-r--r-- | tests/spec/glsl-1.50/execution/geometry/CMakeLists.gl.txt | 1 | ||||
| -rw-r--r-- | tests/spec/glsl-1.50/execution/geometry/gs-emits-too-few-verts.c (renamed from tests/spec/glsl-1.50/gs-emits-too-few-verts.c) | 8 |
4 files changed, 6 insertions, 6 deletions
diff --git a/tests/all.tests b/tests/all.tests index 74db44719..7a051874d 100644 --- a/tests/all.tests +++ b/tests/all.tests @@ -948,7 +948,7 @@ for draw in ['', 'indexed']: ('arb_geometry_shader4-ignore-adjacent-vertices ' 'core {0} {1}').format(draw, prim)) spec['glsl-1.50']['built-in constants'] = concurrent_test('built-in-constants tests/spec/glsl-1.50/minimum-maximums.txt') -spec['glsl-1.50']['gs-emits-too-few-verts'] = concurrent_test('gs-emits-too-few-verts') +spec['glsl-1.50']['gs-emits-too-few-verts'] = concurrent_test('glsl-1.50-gs-emits-too-few-verts') spec['glsl-3.30'] = Group() spec['glsl-3.30']['built-in constants'] = concurrent_test('built-in-constants tests/spec/glsl-3.30/minimum-maximums.txt') diff --git a/tests/spec/glsl-1.50/CMakeLists.gl.txt b/tests/spec/glsl-1.50/CMakeLists.gl.txt index 7609b98cd..703469bbf 100644 --- a/tests/spec/glsl-1.50/CMakeLists.gl.txt +++ b/tests/spec/glsl-1.50/CMakeLists.gl.txt @@ -9,5 +9,4 @@ link_libraries ( ${OPENGL_glu_LIBRARY} ) -piglit_add_executable (gs-emits-too-few-verts gs-emits-too-few-verts.c) # vim: ft=cmake: diff --git a/tests/spec/glsl-1.50/execution/geometry/CMakeLists.gl.txt b/tests/spec/glsl-1.50/execution/geometry/CMakeLists.gl.txt index 865595afb..aefaf41e8 100644 --- a/tests/spec/glsl-1.50/execution/geometry/CMakeLists.gl.txt +++ b/tests/spec/glsl-1.50/execution/geometry/CMakeLists.gl.txt @@ -13,4 +13,5 @@ ${OPENGL_glu_LIBRARY} piglit_add_executable (glsl-1.50-geometry-end-primitive end-primitive.c) piglit_add_executable (glsl-1.50-geometry-primitive-id-restart primitive-id-restart.c) piglit_add_executable (glsl-1.50-geometry-primitive-types primitive-types.c) +piglit_add_executable (glsl-1.50-gs-emits-too-few-verts gs-emits-too-few-verts.c) piglit_add_executable (glsl-1.50-gs-mismatch-prim-type gs-mismatch-prim-type.c) diff --git a/tests/spec/glsl-1.50/gs-emits-too-few-verts.c b/tests/spec/glsl-1.50/execution/geometry/gs-emits-too-few-verts.c index 553e01e78..45e39ce70 100644 --- a/tests/spec/glsl-1.50/gs-emits-too-few-verts.c +++ b/tests/spec/glsl-1.50/execution/geometry/gs-emits-too-few-verts.c @@ -39,7 +39,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN PIGLIT_GL_TEST_CONFIG_END -static const char *vstext = +static const char *vstext = "#version 150\n" "in vec3 vertex;\n" "out vec3 pos;\n" @@ -48,10 +48,10 @@ static const char *vstext = " pos = vertex;\n" "}\n"; -static const char *gstext = +static const char *gstext = "#version 150\n" "layout(triangles) in;\n" - "layout(triangles, max_vertices = 3) out;\n" + "layout(triangle_strip, max_vertices = 3) out;\n" "in vec3 pos[];\n" "void main() {\n" " for(int i = 0; i < 2; i++) {\n" @@ -60,7 +60,7 @@ static const char *gstext = " }\n" "}\n"; -static const char *fstext = +static const char *fstext = "#version 150\n" "out vec4 color;\n" "void main() {\n" |