fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 20:08:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

mesa: Move GLES1/2 vbo entrypoints to vbo_exec_api.c

Browse source 
This let's us drop stubs.c.
This commit is contained in:
Kristian Høgsberg 2010-04-22 20:52:21 -04:00
parent fda7cbdc80
commit cd53b44af0
4 changed files with 81 additions and 117 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

115
src/mesa/es/main/stubs.c
View file

@ -1,115 +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)
#if FEATURE_accum
/* This is a sanity check that to be sure we're using the correct mfeatures.h
* header. We don't want to accidentally use the one from mainline Mesa.
*/
#error "The wrong mfeatures.h file is being included!"
#endif
/* 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, &param);
}
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]);
}

2
src/mesa/es/sources.mak
View file

@ -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 := \

24
src/mesa/vbo/vbo.h
View file

@ -137,7 +137,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

57
src/mesa/vbo/vbo_exec_api.c
View file

@ -954,6 +954,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)
{
@ -961,8 +962,64 @@ _vbo_Materialfv(GLenum face, GLenum pname, const GLfloat *params)
}
void GLAPIENTRY
_vbo_Materialf(GLenum face, GLenum pname, GLfloat param)
{
vbo_Materialfv(face, pname, &param);
}
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);
}