diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2012-08-17 16:03:06 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2012-08-29 15:09:36 -0700 |
| commit | 7e1cab09a155a0f986342323624f460340de355f (patch) | |
| tree | 17ba260a01f1c74bb7bc4ec245f20abbfa2ad21b /src/mesa/main/polygon.c | |
| parent | d638da23d2ec2e9c52655b1ea138249e7f8bcccb (diff) | |
mesa: Only FRONT_AND_BACK is allowed for PolygonMode in core context
Page 407 (page 423 of the PDF) of the OpenGL 3.0 spec says (in the list
of deprecated functionality):
"Separate polygon draw mode - PolygonMode face values of FRONT and
BACK; polygons are always drawn in the same mode, no matter which
face is being rasterized."
Also modify meta to not use FRONT or BACK in a core context.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Diffstat (limited to 'src/mesa/main/polygon.c')
| -rw-r--r-- | src/mesa/main/polygon.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/mesa/main/polygon.c b/src/mesa/main/polygon.c index addca0228d5..d7d52daa89e 100644 --- a/src/mesa/main/polygon.c +++ b/src/mesa/main/polygon.c @@ -143,6 +143,10 @@ _mesa_PolygonMode( GLenum face, GLenum mode ) switch (face) { case GL_FRONT: + if (ctx->API == API_OPENGL_CORE) { + _mesa_error( ctx, GL_INVALID_ENUM, "glPolygonMode(face)" ); + return; + } if (ctx->Polygon.FrontMode == mode) return; FLUSH_VERTICES(ctx, _NEW_POLYGON); @@ -157,6 +161,10 @@ _mesa_PolygonMode( GLenum face, GLenum mode ) ctx->Polygon.BackMode = mode; break; case GL_BACK: + if (ctx->API == API_OPENGL_CORE) { + _mesa_error( ctx, GL_INVALID_ENUM, "glPolygonMode(face)" ); + return; + } if (ctx->Polygon.BackMode == mode) return; FLUSH_VERTICES(ctx, _NEW_POLYGON); |