diff options
| author | Ian Romanick <[email protected]> | 2012-07-27 17:43:22 -0700 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2012-08-29 15:09:36 -0700 |
| commit | 917f68071bcba705970f474fae2cb56cfffa20f5 (patch) | |
| tree | b3156213325b59f99d081c7a2329696f5cb420aa | |
| parent | f778174ea1e431a7113f12c12beb4aba9e825a9f (diff) | |
mesa/es: Validate glPointParameter pname in Mesa code rather than the ES wrapper
v2: Add proper core-profile filtering.
Signed-off-by: Ian Romanick <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
| -rw-r--r-- | src/mesa/main/APIspec.xml | 13 | ||||
| -rw-r--r-- | src/mesa/main/es1_conversion.c | 11 | ||||
| -rw-r--r-- | src/mesa/main/points.c | 2 |
3 files changed, 1 insertions, 25 deletions
diff --git a/src/mesa/main/APIspec.xml b/src/mesa/main/APIspec.xml index 947ece20cc2..a65c5c5297f 100644 --- a/src/mesa/main/APIspec.xml +++ b/src/mesa/main/APIspec.xml @@ -929,19 +929,6 @@ <param name="param" type="GLtype"/> </vector> </proto> - - <desc name="pname"> - <value name="GL_POINT_SIZE_MIN"/> - <value name="GL_POINT_SIZE_MAX"/> - <value name="GL_POINT_FADE_THRESHOLD_SIZE"/> - - <desc name="params" vector_size="1"/> - </desc> - - <desc name="pname"> - <value name="GL_POINT_DISTANCE_ATTENUATION"/> - <desc name="params" vector_size="3"/> - </desc> </template> <template name="VertexAttrib"> diff --git a/src/mesa/main/es1_conversion.c b/src/mesa/main/es1_conversion.c index d7935894439..ae3c5badce4 100644 --- a/src/mesa/main/es1_conversion.c +++ b/src/mesa/main/es1_conversion.c @@ -676,17 +676,6 @@ _es_Orthox(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, void GL_APIENTRY _es_PointParameterx(GLenum pname, GLfixed param) { - switch(pname) { - case GL_POINT_SIZE_MIN: - case GL_POINT_SIZE_MAX: - case GL_POINT_FADE_THRESHOLD_SIZE: - break; - default: - _mesa_error(_mesa_get_current_context(), GL_INVALID_ENUM, - "glPointParameterx(pname=0x%x)", pname); - return; - } - _mesa_PointParameterf(pname, (GLfloat) (param / 65536.0f)); } diff --git a/src/mesa/main/points.c b/src/mesa/main/points.c index eeb1b44339c..d66af2fa156 100644 --- a/src/mesa/main/points.c +++ b/src/mesa/main/points.c @@ -171,7 +171,7 @@ _mesa_PointParameterfv( GLenum pname, const GLfloat *params) * differ. In ARB_point_sprite the POINT_SPRITE_R_MODE is * always ZERO. NV_point_sprite adds the S and R modes. */ - if (ctx->Extensions.NV_point_sprite) { + if (_mesa_is_desktop_gl(ctx) && ctx->Extensions.NV_point_sprite) { GLenum value = (GLenum) params[0]; if (value != GL_ZERO && value != GL_S && value != GL_R) { _mesa_error(ctx, GL_INVALID_VALUE, |