mesa: Move GLES1 texgen functions to texgen.c

diff --git a/src/mesa/es/main/es_texgen.c b/src/mesa/es/main/es_texgen.c
deleted file mode 100644 (file)
index c29a0a7..0000000
--- a/src/mesa/es/main/es_texgen.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (C) 2009 Chia-I Wu <olv@0xlab.org>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
-#include "GLES/gl.h"
-#include "GLES/glext.h"
-
-#include "main/compiler.h" /* for ASSERT */
-
-
-#ifndef GL_S
-#define GL_S                                   0x2000
-#define GL_T                                   0x2001
-#define GL_R                                   0x2002
-#endif
-
-
-extern void GL_APIENTRY _es_GetTexGenfv(GLenum coord, GLenum pname, GLfloat *params);
-extern void GL_APIENTRY _es_TexGenf(GLenum coord, GLenum pname, GLfloat param);
-extern void GL_APIENTRY _es_TexGenfv(GLenum coord, GLenum pname, const GLfloat *params);
-
-extern void GL_APIENTRY _mesa_GetTexGenfv(GLenum coord, GLenum pname, GLfloat *params);
-extern void GL_APIENTRY _mesa_TexGenf(GLenum coord, GLenum pname, GLfloat param);
-extern void GL_APIENTRY _mesa_TexGenfv(GLenum coord, GLenum pname, const GLfloat *params);
-
-
-void GL_APIENTRY
-_es_GetTexGenfv(GLenum coord, GLenum pname, GLfloat *params)
-{
-   ASSERT(coord == GL_TEXTURE_GEN_STR_OES);
-   _mesa_GetTexGenfv(GL_S, pname, params);
-}
-
-
-void GL_APIENTRY
-_es_TexGenf(GLenum coord, GLenum pname, GLfloat param)
-{
-   ASSERT(coord == GL_TEXTURE_GEN_STR_OES);
-   /* set S, T, and R at the same time */
-   _mesa_TexGenf(GL_S, pname, param);
-   _mesa_TexGenf(GL_T, pname, param);
-   _mesa_TexGenf(GL_R, pname, param);
-}
-
-
-void GL_APIENTRY
-_es_TexGenfv(GLenum coord, GLenum pname, const GLfloat *params)
-{
-   ASSERT(coord == GL_TEXTURE_GEN_STR_OES);
-   /* set S, T, and R at the same time */
-   _mesa_TexGenfv(GL_S, pname, params);
-   _mesa_TexGenfv(GL_T, pname, params);
-   _mesa_TexGenfv(GL_R, pname, params);
-}

diff --git a/src/mesa/es/sources.mak b/src/mesa/es/sources.mak
index 339912d..d01603a 100644 (file)
--- a/src/mesa/es/sources.mak
+++ b/src/mesa/es/sources.mak
@@ -5,7 +5,6 @@ include $(MESA)/sources.mak
 LOCAL_ES1_SOURCES :=                   \
        main/drawtex.c                  \
        main/es_query_matrix.c          \
-       main/es_texgen.c                \
        glapi/glapi-es1/main/enums.c
 
 LOCAL_ES1_GALLIUM_SOURCES :=           \

diff --git a/src/mesa/main/texgen.c b/src/mesa/main/texgen.c
index e70ea30..108ea4c 100644 (file)
--- a/src/mesa/main/texgen.c
+++ b/src/mesa/main/texgen.c
@@ -192,6 +192,38 @@ _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)
+{
+   ASSERT(coord == GL_TEXTURE_GEN_STR_OES);
+   _mesa_GetTexGenfv(GL_S, pname, params);
+}
+
+
+void GLAPIENTRY
+_es_TexGenf(GLenum coord, GLenum pname, GLfloat param)
+{
+   ASSERT(coord == GL_TEXTURE_GEN_STR_OES);
+   /* set S, T, and R at the same time */
+   _mesa_TexGenf(GL_S, pname, param);
+   _mesa_TexGenf(GL_T, pname, param);
+   _mesa_TexGenf(GL_R, pname, param);
+}
+
+
+void GLAPIENTRY
+_es_TexGenfv(GLenum coord, GLenum pname, const GLfloat *params)
+{
+   ASSERT(coord == GL_TEXTURE_GEN_STR_OES);
+   /* set S, T, and R at the same time */
+   _mesa_TexGenfv(GL_S, pname, params);
+   _mesa_TexGenfv(GL_T, pname, params);
+   _mesa_TexGenfv(GL_R, pname, params);
+}
+
+#endif
 
 static void GLAPIENTRY
 _mesa_TexGendv(GLenum coord, GLenum pname, const GLdouble *params )

diff --git a/src/mesa/main/texgen.h b/src/mesa/main/texgen.h
index eb46260..397d89e 100644 (file)
--- a/src/mesa/main/texgen.h
+++ b/src/mesa/main/texgen.h
@@ -52,6 +52,17 @@ _mesa_GetTexGenfv( GLenum coord, GLenum pname, GLfloat *params );
 extern void
 _mesa_init_texgen_dispatch(struct _glapi_table *disp);
 
+
+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 */
 
 #define _MESA_INIT_TEXGEN_FUNCTIONS(driver, impl) do { } while (0)