From 1738a6973deb03f33a71c9527594727cb8bb64b4 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Wed, 7 Nov 2012 07:53:41 +0100
Subject: xserver mesa xkbcomp git update 7 nov 2012

xserver: 011f8458805e443ac9130865d2840a929a00cabf
xkbcomp: bd1103ef3cfef9cfed645566f944a69e7ca568b4
mesa: f42518962a08ce927e4ddd233d19d2661e135834
---
 mesalib/src/mesa/main/texgen.c | 27 ++++-----------------------
 1 file changed, 4 insertions(+), 23 deletions(-)

(limited to 'mesalib/src/mesa/main/texgen.c')

diff --git a/mesalib/src/mesa/main/texgen.c b/mesalib/src/mesa/main/texgen.c
index c5a878644..7c9c2a760 100644
--- a/mesalib/src/mesa/main/texgen.c
+++ b/mesalib/src/mesa/main/texgen.c
@@ -186,7 +186,7 @@ _mesa_TexGenfv( GLenum coord, GLenum pname, const GLfloat *params )
 }
 
 
-static void GLAPIENTRY
+void GLAPIENTRY
 _mesa_TexGeniv(GLenum coord, GLenum pname, const GLint *params )
 {
    GLfloat p[4];
@@ -203,7 +203,7 @@ _mesa_TexGeniv(GLenum coord, GLenum pname, const GLint *params )
 }
 
 
-static void GLAPIENTRY
+void GLAPIENTRY
 _mesa_TexGend(GLenum coord, GLenum pname, GLdouble param )
 {
    GLfloat p[4];
@@ -212,7 +212,6 @@ _mesa_TexGend(GLenum coord, GLenum pname, GLdouble param )
    _mesa_TexGenfv( coord, pname, p );
 }
 
-#if FEATURE_ES1
 
 void GLAPIENTRY
 _es_GetTexGenfv(GLenum coord, GLenum pname, GLfloat *params)
@@ -250,9 +249,8 @@ _es_TexGenfv(GLenum coord, GLenum pname, const GLfloat *params)
    _mesa_TexGenfv(GL_R, pname, params);
 }
 
-#endif
 
-static void GLAPIENTRY
+void GLAPIENTRY
 _mesa_TexGendv(GLenum coord, GLenum pname, const GLdouble *params )
 {
    GLfloat p[4];
@@ -290,7 +288,7 @@ _mesa_TexGeni( GLenum coord, GLenum pname, GLint param )
 
 
 
-static void GLAPIENTRY
+void GLAPIENTRY
 _mesa_GetTexGendv( GLenum coord, GLenum pname, GLdouble *params )
 {
    struct gl_texture_unit *texUnit;
@@ -423,20 +421,3 @@ _mesa_GetTexGeniv( GLenum coord, GLenum pname, GLint *params )
       _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGeniv(pname)" );
    }
 }
-
-
-void
-_mesa_init_texgen_dispatch(struct gl_context *ctx, struct _glapi_table *disp)
-{
-   SET_GetTexGenfv(disp, _mesa_GetTexGenfv);
-   SET_GetTexGeniv(disp, _mesa_GetTexGeniv);
-   SET_TexGenf(disp, _mesa_TexGenf);
-   SET_TexGenfv(disp, _mesa_TexGenfv);
-   SET_TexGeni(disp, _mesa_TexGeni);
-   SET_TexGeniv(disp, _mesa_TexGeniv);
-   if (ctx->API == API_OPENGL) {
-      SET_GetTexGendv(disp, _mesa_GetTexGendv);
-      SET_TexGend(disp, _mesa_TexGend);
-      SET_TexGendv(disp, _mesa_TexGendv);
-   }
-}
-- 
cgit v1.2.3