---
tests/shaders/shader_runner.c | 22 ++++------------------
1 files changed, 4 insertions(+), 18 deletions(-)
diff --git a/tests/shaders/shader_runner.c b/tests/shaders/shader_runner.c
index 0ae9e0c..582c85c 100644
--- a/tests/shaders/shader_runner.c
+++ b/tests/shaders/shader_runner.c
@@ -1401,29 +1401,15 @@ struct string_to_enum {
GLenum token;
};
-struct string_to_enum drawing_mode_table[] = {
- { "GL_POINTS", GL_POINTS },
- { "GL_LINE_STRIP", GL_LINE_STRIP },
- { "GL_LINE_LOOP", GL_LINE_LOOP },
- { "GL_LINES", GL_LINES },
- { "GL_POLYGON", GL_POLYGON },
- { "GL_TRIANGLE_STRIP", GL_TRIANGLE_STRIP },
- { "GL_TRIANGLE_FAN", GL_TRIANGLE_FAN },
- { "GL_TRIANGLES", GL_TRIANGLES },
- { "GL_QUAD_STRIP", GL_QUAD_STRIP },
- { "GL_QUADS", GL_QUADS },
- { NULL, 0 }
-};
-
-
GLenum
decode_drawing_mode(const char *mode_str)
{
int i;
- for (i = 0; drawing_mode_table[i].name; ++i) {
- if (0 == strcmp(mode_str, drawing_mode_table[i].name))
- return drawing_mode_table[i].token;
+ for (i = GL_POINTS; i <= GL_POLYGON; ++i) {
+ const char *name = piglit_get_prim_name(i);
+ if (0 == strcmp(mode_str, name))
+ return i;
}
printf("unknown drawing mode \"%s\"", mode_str);
--
1.7.3.4
_______________________________________________
Piglit mailing list
Piglit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/piglit
