diff options
| author | marha <marha@users.sourceforge.net> | 2010-11-29 22:05:53 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-11-29 22:05:53 +0000 |
| commit | fed109d6a33c0871291d1bb2f3f6b7a3d1a3e9d7 (patch) | |
| tree | fa1ba494685a71e28a096990a8707680c7cb378b /mesalib/src/mesa/main/texgen.h | |
| parent | ae340911c1ba1f98b418bd8f1a487fa4d79491b0 (diff) | |
| parent | 6fda93be42ace9eeab0e82ceebb6798961c9105c (diff) | |
| download | vcxsrv-fed109d6a33c0871291d1bb2f3f6b7a3d1a3e9d7.tar.gz vcxsrv-fed109d6a33c0871291d1bb2f3f6b7a3d1a3e9d7.tar.bz2 vcxsrv-fed109d6a33c0871291d1bb2f3f6b7a3d1a3e9d7.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mesa/main/texgen.h')
| -rw-r--r-- | mesalib/src/mesa/main/texgen.h | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/mesalib/src/mesa/main/texgen.h b/mesalib/src/mesa/main/texgen.h index eb4626033..9ed802383 100644 --- a/mesalib/src/mesa/main/texgen.h +++ b/mesalib/src/mesa/main/texgen.h @@ -27,15 +27,13 @@ #define TEXGEN_H -#include "main/mtypes.h" +#include "compiler.h" +#include "glheader.h" +struct _glapi_table; -#if FEATURE_texgen -#define _MESA_INIT_TEXGEN_FUNCTIONS(driver, impl) \ - do { \ - (driver)->TexGen = impl ## TexGen; \ - } while (0) +#if FEATURE_texgen extern void GLAPIENTRY _mesa_TexGenfv( GLenum coord, GLenum pname, const GLfloat *params ); @@ -52,9 +50,18 @@ _mesa_GetTexGenfv( GLenum coord, GLenum pname, GLfloat *params ); extern void _mesa_init_texgen_dispatch(struct _glapi_table *disp); -#else /* FEATURE_texgen */ -#define _MESA_INIT_TEXGEN_FUNCTIONS(driver, impl) do { } while (0) +extern void GLAPIENTRY +_es_GetTexGenfv(GLenum coord, GLenum pname, GLfloat *params); + +extern void GLAPIENTRY +_es_TexGenf(GLenum coord, GLenum pname, GLfloat param); + +extern void GLAPIENTRY +_es_TexGenfv(GLenum coord, GLenum pname, const GLfloat *params); + + +#else /* FEATURE_texgen */ static void _mesa_TexGenfv( GLenum coord, GLenum pname, const GLfloat *params ) |