diff options
author | marha <marha@users.sourceforge.net> | 2012-11-07 07:53:41 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-11-07 07:53:41 +0100 |
commit | 1738a6973deb03f33a71c9527594727cb8bb64b4 (patch) | |
tree | 813603d381b5536ef7a1e2ffd3a137c4bc0623f7 /mesalib/src/mesa/main/colortab.c | |
parent | 1cc98f5a48924d750fbef7ea6b05a1ba49c28589 (diff) | |
download | vcxsrv-1738a6973deb03f33a71c9527594727cb8bb64b4.tar.gz vcxsrv-1738a6973deb03f33a71c9527594727cb8bb64b4.tar.bz2 vcxsrv-1738a6973deb03f33a71c9527594727cb8bb64b4.zip |
xserver mesa xkbcomp git update 7 nov 2012
xserver: 011f8458805e443ac9130865d2840a929a00cabf
xkbcomp: bd1103ef3cfef9cfed645566f944a69e7ca568b4
mesa: f42518962a08ce927e4ddd233d19d2661e135834
Diffstat (limited to 'mesalib/src/mesa/main/colortab.c')
-rw-r--r-- | mesalib/src/mesa/main/colortab.c | 34 |
1 files changed, 8 insertions, 26 deletions
diff --git a/mesalib/src/mesa/main/colortab.c b/mesalib/src/mesa/main/colortab.c index 5799c01f6..f1b3e585a 100644 --- a/mesalib/src/mesa/main/colortab.c +++ b/mesalib/src/mesa/main/colortab.c @@ -63,7 +63,7 @@ _mesa_ColorSubTable( GLenum target, GLsizei start, -static void GLAPIENTRY +void GLAPIENTRY _mesa_CopyColorTable(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width) { @@ -74,7 +74,7 @@ _mesa_CopyColorTable(GLenum target, GLenum internalformat, -static void GLAPIENTRY +void GLAPIENTRY _mesa_CopyColorSubTable(GLenum target, GLsizei start, GLint x, GLint y, GLsizei width) { @@ -85,7 +85,7 @@ _mesa_CopyColorSubTable(GLenum target, GLsizei start, -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetnColorTableARB( GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid *data ) { @@ -95,7 +95,7 @@ _mesa_GetnColorTableARB( GLenum target, GLenum format, GLenum type, } -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetColorTable( GLenum target, GLenum format, GLenum type, GLvoid *data ) { @@ -105,7 +105,7 @@ _mesa_GetColorTable( GLenum target, GLenum format, } -static void GLAPIENTRY +void GLAPIENTRY _mesa_ColorTableParameterfv(GLenum target, GLenum pname, const GLfloat *params) { /* no extensions use this function */ @@ -116,7 +116,7 @@ _mesa_ColorTableParameterfv(GLenum target, GLenum pname, const GLfloat *params) -static void GLAPIENTRY +void GLAPIENTRY _mesa_ColorTableParameteriv(GLenum target, GLenum pname, const GLint *params) { /* no extensions use this function */ @@ -127,7 +127,7 @@ _mesa_ColorTableParameteriv(GLenum target, GLenum pname, const GLint *params) -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetColorTableParameterfv( GLenum target, GLenum pname, GLfloat *params ) { GET_CURRENT_CONTEXT(ctx); @@ -137,28 +137,10 @@ _mesa_GetColorTableParameterfv( GLenum target, GLenum pname, GLfloat *params ) -static void GLAPIENTRY +void GLAPIENTRY _mesa_GetColorTableParameteriv( GLenum target, GLenum pname, GLint *params ) { GET_CURRENT_CONTEXT(ctx); ASSERT_OUTSIDE_BEGIN_END(ctx); _mesa_error(ctx, GL_INVALID_ENUM, "glGetColorTableParameteriv(target)"); } - - -void -_mesa_init_colortable_dispatch(struct _glapi_table *disp) -{ - SET_ColorSubTable(disp, _mesa_ColorSubTable); - SET_ColorTable(disp, _mesa_ColorTable); - SET_ColorTableParameterfv(disp, _mesa_ColorTableParameterfv); - SET_ColorTableParameteriv(disp, _mesa_ColorTableParameteriv); - SET_CopyColorSubTable(disp, _mesa_CopyColorSubTable); - SET_CopyColorTable(disp, _mesa_CopyColorTable); - SET_GetColorTable(disp, _mesa_GetColorTable); - SET_GetColorTableParameterfv(disp, _mesa_GetColorTableParameterfv); - SET_GetColorTableParameteriv(disp, _mesa_GetColorTableParameteriv); - - /* GL_ARB_robustness */ - SET_GetnColorTableARB(disp, _mesa_GetnColorTableARB); -} |