AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make the transition to script-genereated GLX code easier.

Browse Source 
Convert GL 1.4 / ARB_point_parameter function names to EXT_point_parameter /
NV_point_sprite names.
This commit is contained in:
Ian Romanick
2004-12-01 08:42:31 +00:00
parent e9789cf071
commit 529381ff75
4 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/glx/x11/compsize.c
+3 -3
View File
@@ -497,7 +497,7 @@ GLint __glConvolutionParameteriv_size(GLenum pname)
return __glConvolutionParameterfv_size(pname);
}
GLint __glPointParameterfvARB_size(GLenum e)
GLint __glPointParameterfvEXT_size(GLenum e)
{
switch (e) {
case GL_POINT_SIZE_MIN:
@@ -516,7 +516,7 @@ GLint __glPointParameterfvARB_size(GLenum e)
}
}
GLint __glPointParameteriv_size(GLenum e)
GLint __glPointParameterivNV_size(GLenum e)
{
return __glPointParameterfvARB_size(e);
return __glPointParameterfvEXT_size(e);
}
src/glx/x11/indirect.h
+7 -2
View File
@@ -404,8 +404,13 @@ glxvendr_enum1_4(MultiTexCoord4i, X_GLrop_MultiTexCoord4ivARB, GLint, ARB)
glxvendr_enum1_4(MultiTexCoord4f, X_GLrop_MultiTexCoord4fvARB, GLfloat, ARB)
glxvendr_enum1_4(MultiTexCoord4d, X_GLrop_MultiTexCoord4dvARB, GLdouble, ARB)
glxvendr_enum1_V(PointParameterf, X_GLrop_PointParameterf, GLfloat, ARB)
glxproto_enum1_V(PointParameteri, X_GLrop_PointParameteri, GLint)
#define X_GLrop_PointParameterfEXT 2065
#define X_GLrop_PointParameterfvEXT 2066
#define X_GLrop_PointParameteriNV 4221
#define X_GLrop_PointParameterivNV 4222
glxvendr_enum1_V(PointParameterf, X_GLrop_PointParameterf, GLfloat, EXT)
glxvendr_enum1_V(PointParameteri, X_GLrop_PointParameteri, GLint, NV)
glxvendr_3(WindowPos3f, X_GLrop_WindowPos3fARB, GLfloat, MESA)
src/glx/x11/indirect_init.c
+4 -4
View File
@@ -503,8 +503,8 @@ __GLapi *__glXNewIndirectAPI(void)
glAPI->CompressedTexSubImage3DARB = __indirect_glCompressedTexSubImage3DARB;
/* ARB 14. GL_ARB_point_parameters */
glAPI->PointParameterfEXT = __indirect_glPointParameterfARB;
glAPI->PointParameterfvEXT = __indirect_glPointParameterfvARB;
glAPI->PointParameterfEXT = __indirect_glPointParameterfEXT;
glAPI->PointParameterfvEXT = __indirect_glPointParameterfvEXT;
/* ARB 15. GL_ARB_window_pos */
glAPI->WindowPos2dMESA = __indirect_glWindowPos2dMESA;
@@ -567,8 +567,8 @@ __GLapi *__glXNewIndirectAPI(void)
glAPI->BlendFuncSeparateEXT = __indirect_glBlendFuncSeparate;
/* 262. GL_NV_point_sprite / GL 1.4 */
glAPI->PointParameteriNV = __indirect_glPointParameteri;
glAPI->PointParameterivNV = __indirect_glPointParameteriv;
glAPI->PointParameteriNV = __indirect_glPointParameteriNV;
glAPI->PointParameterivNV = __indirect_glPointParameterivNV;
/* 268. GL_EXT_stencil_two_side */
glAPI->ActiveStencilFaceEXT = __indirect_glActiveStencilFaceEXT;
src/glx/x11/size.h
+2 -2
View File
@@ -66,7 +66,7 @@ extern GLint __glTexImage2D_size(GLenum format, GLenum type, GLsizei w, GLsizei
extern GLint __glTexImage3D_size(GLenum format, GLenum type, GLsizei w, GLsizei h, GLsizei d);
extern GLint __glTexParameterfv_size(GLenum e);
extern GLint __glTexParameteriv_size(GLenum e);
extern GLint __glPointParameterfvARB_size(GLenum e);
extern GLint __glPointParameteriv_size(GLenum e);
extern GLint __glPointParameterfvEXT_size(GLenum e);
extern GLint __glPointParameterivNV_size(GLenum e);
#endif /* _size_h_ */