OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: remove EXT/NV suffixes from _mesa_PointParameter functions

Browse Source
This commit is contained in:
Brian Paul
2008-06-05 12:08:19 -06:00
committed by Keith Whitwell
parent d1e1a76f62
commit 9228f1c881
4 changed files with 28 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/mesa/main/attrib.c
View File

@@ -1085,14 +1085,14 @@ _mesa_PopAttrib(void)
_mesa_PointSize(point->Size); _mesa_PointSize(point->Size);
_mesa_set_enable(ctx, GL_POINT_SMOOTH, point->SmoothFlag); _mesa_set_enable(ctx, GL_POINT_SMOOTH, point->SmoothFlag);
if (ctx->Extensions.EXT_point_parameters) { if (ctx->Extensions.EXT_point_parameters) {
_mesa_PointParameterfvEXT(GL_DISTANCE_ATTENUATION_EXT, _mesa_PointParameterfv(GL_DISTANCE_ATTENUATION_EXT,
point->Params); point->Params);
_mesa_PointParameterfEXT(GL_POINT_SIZE_MIN_EXT, _mesa_PointParameterf(GL_POINT_SIZE_MIN_EXT,
point->MinSize); point->MinSize);
_mesa_PointParameterfEXT(GL_POINT_SIZE_MAX_EXT, _mesa_PointParameterf(GL_POINT_SIZE_MAX_EXT,
point->MaxSize); point->MaxSize);
_mesa_PointParameterfEXT(GL_POINT_FADE_THRESHOLD_SIZE_EXT, _mesa_PointParameterf(GL_POINT_FADE_THRESHOLD_SIZE_EXT,
point->Threshold); point->Threshold);
} }
if (ctx->Extensions.NV_point_sprite if (ctx->Extensions.NV_point_sprite
|| ctx->Extensions.ARB_point_sprite) { || ctx->Extensions.ARB_point_sprite) {
@@ -1103,10 +1103,10 @@ _mesa_PopAttrib(void)
} }
_mesa_set_enable(ctx, GL_POINT_SPRITE_NV,point->PointSprite); _mesa_set_enable(ctx, GL_POINT_SPRITE_NV,point->PointSprite);
if (ctx->Extensions.NV_point_sprite) if (ctx->Extensions.NV_point_sprite)
_mesa_PointParameteriNV(GL_POINT_SPRITE_R_MODE_NV, _mesa_PointParameteri(GL_POINT_SPRITE_R_MODE_NV,
ctx->Point.SpriteRMode); ctx->Point.SpriteRMode);
_mesa_PointParameterfEXT(GL_POINT_SPRITE_COORD_ORIGIN, _mesa_PointParameterf(GL_POINT_SPRITE_COORD_ORIGIN,
(GLfloat)ctx->Point.SpriteOrigin); (GLfloat)ctx->Point.SpriteOrigin);
} }
} }
break; break;

29
src/mesa/main/points.c
View File

@@ -65,22 +65,17 @@ _mesa_PointSize( GLfloat size )
#if _HAVE_FULL_GL #if _HAVE_FULL_GL
/*
* Added by GL_NV_point_sprite
*/
void GLAPIENTRY void GLAPIENTRY
_mesa_PointParameteriNV( GLenum pname, GLint param ) _mesa_PointParameteri( GLenum pname, GLint param )
{ {
const GLfloat value = (GLfloat) param; const GLfloat value = (GLfloat) param;
_mesa_PointParameterfvEXT(pname, &value); _mesa_PointParameterfv(pname, &value);
} }
/*
* Added by GL_NV_point_sprite
*/
void GLAPIENTRY void GLAPIENTRY
_mesa_PointParameterivNV( GLenum pname, const GLint *params ) _mesa_PointParameteriv( GLenum pname, const GLint *params )
{ {
GLfloat p[3]; GLfloat p[3];
p[0] = (GLfloat) params[0]; p[0] = (GLfloat) params[0];
@@ -88,27 +83,19 @@ _mesa_PointParameterivNV( GLenum pname, const GLint *params )
p[1] = (GLfloat) params[1]; p[1] = (GLfloat) params[1];
p[2] = (GLfloat) params[2]; p[2] = (GLfloat) params[2];
} }
_mesa_PointParameterfvEXT(pname, p); _mesa_PointParameterfv(pname, p);
} }
/*
* Same for both GL_EXT_point_parameters and GL_ARB_point_parameters.
*/
void GLAPIENTRY void GLAPIENTRY
_mesa_PointParameterfEXT( GLenum pname, GLfloat param) _mesa_PointParameterf( GLenum pname, GLfloat param)
{ {
_mesa_PointParameterfvEXT(pname, &param); _mesa_PointParameterfv(pname, &param);
} }
/*
* Same for both GL_EXT_point_parameters and GL_ARB_point_parameters.
*/
void GLAPIENTRY void GLAPIENTRY
_mesa_PointParameterfvEXT( GLenum pname, const GLfloat *params) _mesa_PointParameterfv( GLenum pname, const GLfloat *params)
{ {
GET_CURRENT_CONTEXT(ctx); GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END(ctx); ASSERT_OUTSIDE_BEGIN_END(ctx);

8
src/mesa/main/points.h
View File

@@ -39,16 +39,16 @@ extern void GLAPIENTRY
_mesa_PointSize( GLfloat size ); _mesa_PointSize( GLfloat size );
extern void GLAPIENTRY extern void GLAPIENTRY
_mesa_PointParameteriNV( GLenum pname, GLint param ); _mesa_PointParameteri( GLenum pname, GLint param );
extern void GLAPIENTRY extern void GLAPIENTRY
_mesa_PointParameterivNV( GLenum pname, const GLint *params ); _mesa_PointParameteriv( GLenum pname, const GLint *params );
extern void GLAPIENTRY extern void GLAPIENTRY
_mesa_PointParameterfEXT( GLenum pname, GLfloat param ); _mesa_PointParameterf( GLenum pname, GLfloat param );
extern void GLAPIENTRY extern void GLAPIENTRY
_mesa_PointParameterfvEXT( GLenum pname, const GLfloat *params ); _mesa_PointParameterfv( GLenum pname, const GLfloat *params );
extern void extern void
_mesa_init_point( GLcontext * ctx ); _mesa_init_point( GLcontext * ctx );

8
src/mesa/main/state.c
View File

@@ -457,8 +457,8 @@ _mesa_init_exec_table(struct _glapi_table *exec)
/* 54. GL_EXT_point_parameters */ /* 54. GL_EXT_point_parameters */
#if _HAVE_FULL_GL #if _HAVE_FULL_GL
SET_PointParameterfEXT(exec, _mesa_PointParameterfEXT); SET_PointParameterfEXT(exec, _mesa_PointParameterf);
SET_PointParameterfvEXT(exec, _mesa_PointParameterfvEXT); SET_PointParameterfvEXT(exec, _mesa_PointParameterfv);
#endif #endif
/* 97. GL_EXT_compiled_vertex_array */ /* 97. GL_EXT_compiled_vertex_array */
@@ -571,8 +571,8 @@ _mesa_init_exec_table(struct _glapi_table *exec)
/* 262. GL_NV_point_sprite */ /* 262. GL_NV_point_sprite */
#if _HAVE_FULL_GL #if _HAVE_FULL_GL
SET_PointParameteriNV(exec, _mesa_PointParameteriNV); SET_PointParameteriNV(exec, _mesa_PointParameteri);
SET_PointParameterivNV(exec, _mesa_PointParameterivNV); SET_PointParameterivNV(exec, _mesa_PointParameteriv);
#endif #endif
/* 268. GL_EXT_stencil_two_side */ /* 268. GL_EXT_stencil_two_side */