summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2008-06-05 12:08:19 -0600
committerBrian Paul <brian.paul@tungstengraphics.com>2008-06-05 12:08:19 -0600
commit16e8ee33bd3db1b14a97b3ddd2a7a8833851f8fb (patch)
tree2541ce2353b86f4e48140cfe37c007435e018297 /src/mesa
parentfeb722fa98f04a4487b7ec4746bcc8c7296899c8 (diff)
mesa: remove EXT/NV suffixes from _mesa_PointParameter functions
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/main/attrib.c24
-rw-r--r--src/mesa/main/points.c29
-rw-r--r--src/mesa/main/points.h8
-rw-r--r--src/mesa/main/state.c8
4 files changed, 28 insertions, 41 deletions
diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index b422198f92..39666d175a 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -1074,14 +1074,14 @@ _mesa_PopAttrib(void)
_mesa_PointSize(point->Size);
_mesa_set_enable(ctx, GL_POINT_SMOOTH, point->SmoothFlag);
if (ctx->Extensions.EXT_point_parameters) {
- _mesa_PointParameterfvEXT(GL_DISTANCE_ATTENUATION_EXT,
- point->Params);
- _mesa_PointParameterfEXT(GL_POINT_SIZE_MIN_EXT,
- point->MinSize);
- _mesa_PointParameterfEXT(GL_POINT_SIZE_MAX_EXT,
- point->MaxSize);
- _mesa_PointParameterfEXT(GL_POINT_FADE_THRESHOLD_SIZE_EXT,
- point->Threshold);
+ _mesa_PointParameterfv(GL_DISTANCE_ATTENUATION_EXT,
+ point->Params);
+ _mesa_PointParameterf(GL_POINT_SIZE_MIN_EXT,
+ point->MinSize);
+ _mesa_PointParameterf(GL_POINT_SIZE_MAX_EXT,
+ point->MaxSize);
+ _mesa_PointParameterf(GL_POINT_FADE_THRESHOLD_SIZE_EXT,
+ point->Threshold);
}
if (ctx->Extensions.NV_point_sprite
|| ctx->Extensions.ARB_point_sprite) {
@@ -1091,10 +1091,10 @@ _mesa_PopAttrib(void)
(GLint) point->CoordReplace[u]);
}
_mesa_set_enable(ctx, GL_POINT_SPRITE_NV,point->PointSprite);
- _mesa_PointParameteriNV(GL_POINT_SPRITE_R_MODE_NV,
- ctx->Point.SpriteRMode);
- _mesa_PointParameterfEXT(GL_POINT_SPRITE_COORD_ORIGIN,
- (GLfloat)ctx->Point.SpriteOrigin);
+ _mesa_PointParameteri(GL_POINT_SPRITE_R_MODE_NV,
+ ctx->Point.SpriteRMode);
+ _mesa_PointParameterf(GL_POINT_SPRITE_COORD_ORIGIN,
+ (GLfloat)ctx->Point.SpriteOrigin);
}
}
break;
diff --git a/src/mesa/main/points.c b/src/mesa/main/points.c
index e83db5de78..fbedbcb22c 100644
--- a/src/mesa/main/points.c
+++ b/src/mesa/main/points.c
@@ -65,45 +65,32 @@ _mesa_PointSize( GLfloat size )
#if _HAVE_FULL_GL
-/*
- * Added by GL_NV_point_sprite
- */
+
void GLAPIENTRY
-_mesa_PointParameteriNV( GLenum pname, GLint param )
+_mesa_PointParameteri( GLenum pname, GLint param )
{
const GLfloat value = (GLfloat) param;
- _mesa_PointParameterfvEXT(pname, &value);
+ _mesa_PointParameterfv(pname, &value);
}
-/*
- * Added by GL_NV_point_sprite
- */
void GLAPIENTRY
-_mesa_PointParameterivNV( GLenum pname, const GLint *params )
+_mesa_PointParameteriv( GLenum pname, const GLint *params )
{
const GLfloat value = (GLfloat) params[0];
- _mesa_PointParameterfvEXT(pname, &value);
+ _mesa_PointParameterfv(pname, &value);
}
-
-/*
- * Same for both GL_EXT_point_parameters and GL_ARB_point_parameters.
- */
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
-_mesa_PointParameterfvEXT( GLenum pname, const GLfloat *params)
+_mesa_PointParameterfv( GLenum pname, const GLfloat *params)
{
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END(ctx);
diff --git a/src/mesa/main/points.h b/src/mesa/main/points.h
index 951ff677db..156641eab9 100644
--- a/src/mesa/main/points.h
+++ b/src/mesa/main/points.h
@@ -39,16 +39,16 @@ extern void GLAPIENTRY
_mesa_PointSize( GLfloat size );
extern void GLAPIENTRY
-_mesa_PointParameteriNV( GLenum pname, GLint param );
+_mesa_PointParameteri( GLenum pname, GLint param );
extern void GLAPIENTRY
-_mesa_PointParameterivNV( GLenum pname, const GLint *params );
+_mesa_PointParameteriv( GLenum pname, const GLint *params );
extern void GLAPIENTRY
-_mesa_PointParameterfEXT( GLenum pname, GLfloat param );
+_mesa_PointParameterf( GLenum pname, GLfloat param );
extern void GLAPIENTRY
-_mesa_PointParameterfvEXT( GLenum pname, const GLfloat *params );
+_mesa_PointParameterfv( GLenum pname, const GLfloat *params );
extern void
_mesa_init_point( GLcontext * ctx );
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index cdf1249cd0..7e8f964bb1 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -457,8 +457,8 @@ _mesa_init_exec_table(struct _glapi_table *exec)
/* 54. GL_EXT_point_parameters */
#if _HAVE_FULL_GL
- SET_PointParameterfEXT(exec, _mesa_PointParameterfEXT);
- SET_PointParameterfvEXT(exec, _mesa_PointParameterfvEXT);
+ SET_PointParameterfEXT(exec, _mesa_PointParameterf);
+ SET_PointParameterfvEXT(exec, _mesa_PointParameterfv);
#endif
/* 97. GL_EXT_compiled_vertex_array */
@@ -571,8 +571,8 @@ _mesa_init_exec_table(struct _glapi_table *exec)
/* 262. GL_NV_point_sprite */
#if _HAVE_FULL_GL
- SET_PointParameteriNV(exec, _mesa_PointParameteriNV);
- SET_PointParameterivNV(exec, _mesa_PointParameterivNV);
+ SET_PointParameteriNV(exec, _mesa_PointParameteri);
+ SET_PointParameterivNV(exec, _mesa_PointParameteriv);
#endif
/* 268. GL_EXT_stencil_two_side */