From: Kristian Høgsberg Date: Fri, 23 Apr 2010 00:52:21 +0000 (-0400) Subject: mesa: Move GLES1/2 vbo entrypoints to vbo_exec_api.c X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=44f9aef9ee9ceda0659e882afbac4d877267c4fd;p=mesa.git mesa: Move GLES1/2 vbo entrypoints to vbo_exec_api.c This let's us drop stubs.c. --- diff --git a/src/mesa/es/main/stubs.c b/src/mesa/es/main/stubs.c deleted file mode 100644 index 65866917150..00000000000 --- a/src/mesa/es/main/stubs.c +++ /dev/null @@ -1,108 +0,0 @@ -/************************************************************************** - * - * Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas. - * All Rights Reserved. - * - * 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 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 - * TUNGSTEN GRAPHICS 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. - **************************************************************************/ - - -/** - * Temporary stubs for "missing" mesa functions. - */ - - -#include "main/mtypes.h" -#include "main/imports.h" -#include "vbo/vbo.h" - -#define NEED_IMPLEMENT() do { \ - GET_CURRENT_CONTEXT(ctx); \ - _mesa_error(ctx, GL_INVALID_OPERATION, __FUNCTION__); \ - } while (0) - - -/* silence compiler warnings */ -extern void GLAPIENTRY _vbo_Materialf(GLenum face, GLenum pname, GLfloat param); -extern void GLAPIENTRY _mesa_GetShaderPrecisionFormat(GLenum shadertype, GLenum precisiontype, GLint* range, GLint* precision); -extern void GLAPIENTRY _mesa_ReleaseShaderCompiler(void); -extern void GLAPIENTRY _mesa_ShaderBinary(GLint n, const GLuint* shaders, GLenum binaryformat, const void* binary, GLint length); -extern void GLAPIENTRY _vbo_VertexAttrib1f(GLuint indx, GLfloat x); -extern void GLAPIENTRY _vbo_VertexAttrib1fv(GLuint indx, const GLfloat* values); -extern void GLAPIENTRY _vbo_VertexAttrib2f(GLuint indx, GLfloat x, GLfloat y); -extern void GLAPIENTRY _vbo_VertexAttrib2fv(GLuint indx, const GLfloat* values); -extern void GLAPIENTRY _vbo_VertexAttrib3f(GLuint indx, GLfloat x, GLfloat y, GLfloat z); -extern void GLAPIENTRY _vbo_VertexAttrib3fv(GLuint indx, const GLfloat* values); -extern void GLAPIENTRY _vbo_VertexAttrib4fv(GLuint indx, const GLfloat* values); - - -void GLAPIENTRY -_vbo_Materialf(GLenum face, GLenum pname, GLfloat param) -{ - _vbo_Materialfv(face, pname, ¶m); -} - - -void GLAPIENTRY -_vbo_VertexAttrib1f(GLuint indx, GLfloat x) -{ - _vbo_VertexAttrib4f(indx, x, 0.0, 0.0, 1.0f); -} - - -void GLAPIENTRY -_vbo_VertexAttrib1fv(GLuint indx, const GLfloat* values) -{ - _vbo_VertexAttrib4f(indx, values[0], 0.0, 0.0, 1.0f); -} - - -void GLAPIENTRY -_vbo_VertexAttrib2f(GLuint indx, GLfloat x, GLfloat y) -{ - _vbo_VertexAttrib4f(indx, x, y, 0.0, 1.0f); -} - - -void GLAPIENTRY -_vbo_VertexAttrib2fv(GLuint indx, const GLfloat* values) -{ - _vbo_VertexAttrib4f(indx, values[0], values[1], 0.0, 1.0f); -} - - -void GLAPIENTRY -_vbo_VertexAttrib3f(GLuint indx, GLfloat x, GLfloat y, GLfloat z) -{ - _vbo_VertexAttrib4f(indx, x, y, z, 1.0f); -} - - -void GLAPIENTRY -_vbo_VertexAttrib3fv(GLuint indx, const GLfloat* values) -{ - _vbo_VertexAttrib4f(indx, values[0], values[1], values[2], 1.0f); -} - - -void GLAPIENTRY -_vbo_VertexAttrib4fv(GLuint indx, const GLfloat* values) -{ - _vbo_VertexAttrib4f(indx, values[0], values[1], values[2], values[3]); -} diff --git a/src/mesa/es/sources.mak b/src/mesa/es/sources.mak index 0f682f507e9..e6908feea31 100644 --- a/src/mesa/es/sources.mak +++ b/src/mesa/es/sources.mak @@ -10,7 +10,6 @@ LOCAL_ES1_SOURCES := \ main/es_fbo.c \ main/es_query_matrix.c \ main/es_texgen.c \ - main/stubs.c \ glapi/glapi-es1/main/enums.c LOCAL_ES1_GALLIUM_SOURCES := \ @@ -30,7 +29,6 @@ LOCAL_ES2_SOURCES := \ main/get_es2.c \ main/es_cpaltex.c \ main/es_fbo.c \ - main/stubs.c \ glapi/glapi-es2/main/enums.c LOCAL_ES2_GALLIUM_SOURCES := \ diff --git a/src/mesa/vbo/vbo.h b/src/mesa/vbo/vbo.h index 7a085f63c73..07d31f6ce36 100644 --- a/src/mesa/vbo/vbo.h +++ b/src/mesa/vbo/vbo.h @@ -138,7 +138,31 @@ _vbo_MultiTexCoord4f(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q); void GLAPIENTRY _vbo_Materialfv(GLenum face, GLenum pname, const GLfloat *params); +void GLAPIENTRY +_vbo_Materialf(GLenum face, GLenum pname, GLfloat param); + void GLAPIENTRY _vbo_VertexAttrib4f(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); +void GLAPIENTRY +_vbo_VertexAttrib1f(GLuint indx, GLfloat x); + +void GLAPIENTRY +_vbo_VertexAttrib1fv(GLuint indx, const GLfloat* values); + +void GLAPIENTRY +_vbo_VertexAttrib2f(GLuint indx, GLfloat x, GLfloat y); + +void GLAPIENTRY +_vbo_VertexAttrib2fv(GLuint indx, const GLfloat* values); + +void GLAPIENTRY +_vbo_VertexAttrib3f(GLuint indx, GLfloat x, GLfloat y, GLfloat z); + +void GLAPIENTRY +_vbo_VertexAttrib3fv(GLuint indx, const GLfloat* values); + +void GLAPIENTRY +_vbo_VertexAttrib4fv(GLuint indx, const GLfloat* values); + #endif diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c index 0ccbb423831..365419d44fa 100644 --- a/src/mesa/vbo/vbo_exec_api.c +++ b/src/mesa/vbo/vbo_exec_api.c @@ -958,6 +958,7 @@ _vbo_MultiTexCoord4f(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q) vbo_MultiTexCoord4f(target, s, t, r, q); } + void GLAPIENTRY _vbo_Materialfv(GLenum face, GLenum pname, const GLfloat *params) { @@ -965,8 +966,64 @@ _vbo_Materialfv(GLenum face, GLenum pname, const GLfloat *params) } +void GLAPIENTRY +_vbo_Materialf(GLenum face, GLenum pname, GLfloat param) +{ + vbo_Materialfv(face, pname, ¶m); +} + + void GLAPIENTRY _vbo_VertexAttrib4f(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w) { vbo_VertexAttrib4fARB(index, x, y, z, w); } + + +void GLAPIENTRY +_vbo_VertexAttrib1f(GLuint indx, GLfloat x) +{ + vbo_VertexAttrib1fARB(indx, x); +} + + +void GLAPIENTRY +_vbo_VertexAttrib1fv(GLuint indx, const GLfloat* values) +{ + vbo_VertexAttrib1fvARB(indx, values); +} + + +void GLAPIENTRY +_vbo_VertexAttrib2f(GLuint indx, GLfloat x, GLfloat y) +{ + vbo_VertexAttrib2fARB(indx, x, y); +} + + +void GLAPIENTRY +_vbo_VertexAttrib2fv(GLuint indx, const GLfloat* values) +{ + vbo_VertexAttrib2fvARB(indx, values); +} + + +void GLAPIENTRY +_vbo_VertexAttrib3f(GLuint indx, GLfloat x, GLfloat y, GLfloat z) +{ + vbo_VertexAttrib3fARB(indx, x, y, z); +} + + +void GLAPIENTRY +_vbo_VertexAttrib3fv(GLuint indx, const GLfloat* values) +{ + vbo_VertexAttrib3fvARB(indx, values); +} + + +void GLAPIENTRY +_vbo_VertexAttrib4fv(GLuint indx, const GLfloat* values) +{ + vbo_VertexAttrib4fvARB(indx, values); +}