commit 5e9cff0b97b1301c2b13dbfe2570ddb4551f814f
author Brian <brian.paul@tungstengraphics.com> Fri Jun 08 13:02:14 2007 -0600
committer Brian <brian.paul@tungstengraphics.com> Fri Jun 08 13:02:14 2007 -0600
tree deac4147178dd708f7309e90bb72fd8b73efc65d
parent 009ddb4e509f7dd39a17408332c6b0eff47a16fe

disable shader program before glDrawPixels

progs/tests/drawbuffers.c

diff --git a/progs/tests/drawbuffers.c b/progs/tests/drawbuffers.c
index 8583bac..d2e826f 100644
--- a/progs/tests/drawbuffers.c
+++ b/progs/tests/drawbuffers.c
@@ -19,6 +19,7 @@
 static int Width = 400, Height = 400;
 static GLuint FBobject, RBobjects[3];
 static GLfloat Xrot = 0.0, Yrot = 0.0;
+static GLuint Program;
 
 
 static void
@@ -40,6 +41,8 @@
       GL_COLOR_ATTACHMENT1_EXT
    };
 
+   glUseProgram_func(Program);
+
    /* draw to user framebuffer */
    glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, FBobject);
 
@@ -75,6 +78,7 @@
                 buffer + Width * Height / 2 * 4);
 
    /* draw to window */
+   glUseProgram_func(0);
    glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
    glWindowPos2iARB(0, 0);
    glDrawPixels(Width, Height, GL_RGBA, GL_UNSIGNED_BYTE, buffer);
@@ -243,15 +247,15 @@
       "   gl_FragData[1] = vec4(1.0) - gl_Color; \n"
       "}\n";
 
-   GLuint fragShader, program;
+   GLuint fragShader;
 
    fragShader = LoadAndCompileShader(GL_FRAGMENT_SHADER, fragShaderText);
-   program = glCreateProgram_func();
+   Program = glCreateProgram_func();
 
-   glAttachShader_func(program, fragShader);
-   glLinkProgram_func(program);
-   CheckLink(program);
-   glUseProgram_func(program);
+   glAttachShader_func(Program, fragShader);
+   glLinkProgram_func(Program);
+   CheckLink(Program);
+   glUseProgram_func(Program);
 }