diff options
| author | Eric Anholt <eric@anholt.net> | 2007-05-18 14:14:12 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2007-05-18 14:14:12 -0700 |
| commit | 1bdee1853627e08894bd267b8f0ec176a1b5978f (patch) | |
| tree | 78c3b8bb81e866de4544d2621abb633b008095ab /progs/util/extfuncs.h | |
| parent | c085e350df593ab2af60f53b86265db4c3eab38a (diff) | |
| parent | 4fca6bfa5d211a093c54b0bbeadaa38081e8c141 (diff) | |
Merge branch 'master' into i915-unification
Conflicts:
src/mesa/drivers/dri/common/dri_bufmgr.c
src/mesa/drivers/dri/common/dri_drmpool.c
src/mesa/drivers/dri/i915tex/intel_batchpool.c
src/mesa/drivers/dri/i915tex/intel_buffer_objects.c
src/mesa/drivers/dri/i915tex/intel_regions.c
src/mesa/drivers/dri/i915tex/intel_screen.c
src/mesa/drivers/dri/i915tex/intel_screen.h
Diffstat (limited to 'progs/util/extfuncs.h')
| -rw-r--r-- | progs/util/extfuncs.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/progs/util/extfuncs.h b/progs/util/extfuncs.h index 90302bb510..5d647cdae7 100644 --- a/progs/util/extfuncs.h +++ b/progs/util/extfuncs.h @@ -11,6 +11,7 @@ static PFNGLCREATEPROGRAMPROC glCreateProgram_func = NULL; static PFNGLCREATESHADERPROC glCreateShader_func = NULL; static PFNGLDELETEPROGRAMPROC glDeleteProgram_func = NULL; static PFNGLDELETESHADERPROC glDeleteShader_func = NULL; +static PFNGLGETACTIVEATTRIBPROC glGetActiveAttrib_func = NULL; static PFNGLGETATTACHEDSHADERSPROC glGetAttachedShaders_func = NULL; static PFNGLGETATTRIBLOCATIONPROC glGetAttribLocation_func = NULL; static PFNGLGETPROGRAMINFOLOGPROC glGetProgramInfoLog_func = NULL; @@ -78,6 +79,7 @@ GetExtensionFuncs(void) glCreateShader_func = (PFNGLCREATESHADERPROC) glutGetProcAddress("glCreateShader"); glDeleteProgram_func = (PFNGLDELETEPROGRAMPROC) glutGetProcAddress("glDeleteProgram"); glDeleteShader_func = (PFNGLDELETESHADERPROC) glutGetProcAddress("glDeleteShader"); + glGetActiveAttrib_func = (PFNGLGETACTIVEATTRIBPROC) glutGetProcAddress("glGetActiveAttrib"); glGetAttachedShaders_func = (PFNGLGETATTACHEDSHADERSPROC) glutGetProcAddress("glGetAttachedShaders"); glGetAttribLocation_func = (PFNGLGETATTRIBLOCATIONPROC) glutGetProcAddress("glGetAttribLocation"); glGetProgramInfoLog_func = (PFNGLGETPROGRAMINFOLOGPROC) glutGetProcAddress("glGetProgramInfoLog"); |