diff options
| author | Brian Paul <brianp@vmware.com> | 2013-02-21 08:31:11 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2013-02-22 16:48:59 -0700 |
| commit | f2c06679232e4aed86f6e8bee4b9697d77a7ed5e (patch) | |
| tree | 542d49b1fca96641bd446bed3dafffa8f3275d5d | |
| parent | d0b9f0f62af2e470274e79acc66033aaa350b5d7 (diff) | |
shader_runner: use piglit_get_prim_name()
Reviewed-by: Eric Anholt <eric@anholt.net>
| -rw-r--r-- | 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 eae50634..d1c1cda4 100644 --- a/tests/shaders/shader_runner.c +++ b/tests/shaders/shader_runner.c @@ -1474,29 +1474,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); |