diff options
| author | Ian Romanick <[email protected]> | 2009-11-30 17:47:07 -0800 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2009-11-30 17:47:07 -0800 |
| commit | 650e02003fbb5511ec758d993b7ec0a302ee2235 (patch) | |
| tree | 96ff849518962856e51b2e3a26b78ba008b2f9ad /src/mesa/main/points.c | |
| parent | 270d36da146b899d39e08f830fe34b63833a3731 (diff) | |
| parent | 587a52e95bbe96788e8b96b63f091bb3022fc048 (diff) | |
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
Conflicts:
progs/util/shaderutil.c
src/mesa/drivers/dri/r600/r600_context.c
src/mesa/main/version.h
Diffstat (limited to 'src/mesa/main/points.c')
| -rw-r--r-- | src/mesa/main/points.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/mesa/main/points.c b/src/mesa/main/points.c index 4c8fc1f72e0..b3305448904 100644 --- a/src/mesa/main/points.c +++ b/src/mesa/main/points.c @@ -200,7 +200,12 @@ _mesa_PointParameterfv( GLenum pname, const GLfloat *params) } break; case GL_POINT_SPRITE_COORD_ORIGIN: - if (ctx->Extensions.ARB_point_sprite || ctx->Extensions.NV_point_sprite) { + /* This is not completely correct. GL_POINT_SPRITE_COORD_ORIGIN was + * added to point sprites when the extension was merged into OpenGL + * 2.0. It is expected that an implementation supporting OpenGL 1.4 + * and GL_ARB_point_sprite will generate an error here. + */ + if (ctx->Extensions.ARB_point_sprite) { GLenum value = (GLenum) params[0]; if (value != GL_LOWER_LEFT && value != GL_UPPER_LEFT) { _mesa_error(ctx, GL_INVALID_VALUE, |