diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2010-10-12 16:40:08 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2010-10-12 19:24:28 -0700 |
| commit | 4aaf95afaaaba1c1d146cbba6f0643c8e3ad24d7 (patch) | |
| tree | f8d13d4b954abb5d1e5bc98897be249cb85dcf8c /tests/shaders/glsl-useprogram-displaylist.c | |
| parent | 358bdc55f623f36db439a29059af8f522b6192d5 (diff) | |
glsl-useprogram-displaylist: Use piglit_draw_rect, related clean ups
Diffstat (limited to 'tests/shaders/glsl-useprogram-displaylist.c')
| -rw-r--r-- | tests/shaders/glsl-useprogram-displaylist.c | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/tests/shaders/glsl-useprogram-displaylist.c b/tests/shaders/glsl-useprogram-displaylist.c index 0d6b767f..e0377774 100644 --- a/tests/shaders/glsl-useprogram-displaylist.c +++ b/tests/shaders/glsl-useprogram-displaylist.c @@ -31,7 +31,7 @@ #include "piglit-util.h" -int piglit_width = 400, piglit_height = 300; +int piglit_width = 100, piglit_height = 100; int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE; static GLint progr; @@ -41,15 +41,10 @@ static GLint fsg; static GLint vs; static GLuint list; -static GLfloat vertices[12] = {150.0, 125.0, 0.0, - 150.0, 175.0, 0.0, - 100.0, 125.0, 0.0, - 100.0, 175.0, 0.0}; - static const char *vertShaderText = "void main()\n" "{ \n" - " gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;\n" + " gl_Position = gl_Vertex;\n" "} \n"; static const char *fragShaderTextRed = @@ -75,11 +70,6 @@ compileLinkProg(void) progr = piglit_link_simple_program(vs, fsr); progg = piglit_link_simple_program(vs, fsg); - glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 3*sizeof(GLfloat), - vertices); - - glEnableVertexAttribArray(0); - list = glGenLists(1); glNewList(list, GL_COMPILE); glUseProgram(progg); @@ -95,8 +85,6 @@ piglit_init(int argc, char **argv) piglit_report_result(PIGLIT_SKIP); } - piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE); - glClearColor(0.2, 0.2, 0.2, 1.0); compileLinkProg(); @@ -113,11 +101,10 @@ piglit_display(void) glUseProgram(progr); glCallList(list); - glDrawArrays(GL_TRIANGLE_STRIP,0,4); - - pass = piglit_probe_pixel_rgb(125, 150, green); + piglit_draw_rect(-0.5, -0.5, 1.0, 1.0); + pass = piglit_probe_pixel_rgb(piglit_width / 2, piglit_height / 2, + green); - glFinish(); glutSwapBuffers(); return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE; |