diff options
| author | Brian Paul <brianp@vmware.com> | 2009-07-17 22:00:47 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-07-17 22:00:47 -0600 |
| commit | b96ae1b2c463d6d99ee0418083ef68f4027b7cd7 (patch) | |
| tree | f34f89c267b940eb7408475bd0c2ff57c7fbe992 /progs/glsl/samplers.c | |
| parent | f81f57e25db18b1c69f2f8076380603340fa2cda (diff) | |
| parent | cd10996d4f517c69e306eaf6dfb0654432651b3a (diff) | |
Merge branch 'mesa_7_5_branch'
Conflicts:
Makefile
progs/glsl/multitex.c
src/mesa/main/enums.c
src/mesa/main/state.c
src/mesa/main/texenvprogram.c
src/mesa/main/version.h
Diffstat (limited to 'progs/glsl/samplers.c')
| -rw-r--r-- | progs/glsl/samplers.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/progs/glsl/samplers.c b/progs/glsl/samplers.c index cbb264dad1..113e5bbeff 100644 --- a/progs/glsl/samplers.c +++ b/progs/glsl/samplers.c @@ -42,7 +42,6 @@ #include <GL/glew.h> #include "GL/glut.h" #include "readtex.h" -#include "extfuncs.h" #include "shaderutil.h" @@ -291,7 +290,7 @@ CreateProgram(void) assert(vertShader); program = LinkShaders(vertShader, fragShader); - glUseProgram_func(program); + glUseProgram(program); free(fragShaderText); @@ -316,10 +315,10 @@ InitProgram(void) #else sprintf(uname, "tex[%d]", s); #endif - loc = glGetUniformLocation_func(Program, uname); + loc = glGetUniformLocation(Program, uname); assert(loc >= 0); - glUniform1i_func(loc, s); + glUniform1i(loc, s); } } @@ -334,8 +333,6 @@ InitGL(void) printf("GL_RENDERER = %s\n", (const char *) glGetString(GL_RENDERER)); - GetExtensionFuncs(); - glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, &NumSamplers); if (NumSamplers > MAX_SAMPLERS) NumSamplers = MAX_SAMPLERS; |