diff options
| author | Ian Romanick <[email protected]> | 2009-09-10 15:33:45 -0700 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2009-09-10 15:33:45 -0700 |
| commit | b8e1e8d2d8ae6ffbf8f271b46ee89788a926b3b0 (patch) | |
| tree | 5db502ab80287bfc8ff61082784017c7448464f5 /src/mesa/main/get.h | |
| parent | 81722c5d7e8e93d837510b9e6e5d014ec64cf4b3 (diff) | |
| parent | d9dc4cb0e4f578da9e50c9d1ba6fd9c22ea2fca6 (diff) | |
Merge branch 'master' into asm-shader-rework-2
Conflicts:
src/mesa/shader/lex.yy.c
src/mesa/shader/program_parse.tab.c
src/mesa/shader/program_parse.tab.h
Diffstat (limited to 'src/mesa/main/get.h')
| -rw-r--r-- | src/mesa/main/get.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/mesa/main/get.h b/src/mesa/main/get.h index 9b47b230a98..77a9a7d04b4 100644 --- a/src/mesa/main/get.h +++ b/src/mesa/main/get.h @@ -48,6 +48,9 @@ extern void GLAPIENTRY _mesa_GetIntegerv( GLenum pname, GLint *params ); extern void GLAPIENTRY +_mesa_GetInteger64v( GLenum pname, GLint64 *params ); + +extern void GLAPIENTRY _mesa_GetPointerv( GLenum pname, GLvoid **params ); extern const GLubyte * GLAPIENTRY |