diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/main/api_validate.c | 13 | ||||
| -rw-r--r-- | src/mesa/main/extensions_table.h | 1 | ||||
| -rw-r--r-- | src/mesa/main/mtypes.h | 1 | ||||
| -rw-r--r-- | src/mesa/main/polygon.c | 13 |
4 files changed, 26 insertions, 2 deletions
diff --git a/src/mesa/main/api_validate.c b/src/mesa/main/api_validate.c index 44d164ad355..af4f7cb4bf3 100644 --- a/src/mesa/main/api_validate.c +++ b/src/mesa/main/api_validate.c @@ -189,6 +189,19 @@ _mesa_valid_to_render(struct gl_context *ctx, const char *where) return GL_FALSE; } + /* From the GL_NV_fill_rectangle spec: + * + * "An INVALID_OPERATION error is generated by Begin or any Draw command if + * only one of the front and back polygon mode is FILL_RECTANGLE_NV." + */ + if ((ctx->Polygon.FrontMode == GL_FILL_RECTANGLE_NV) != + (ctx->Polygon.BackMode == GL_FILL_RECTANGLE_NV)) { + _mesa_error(ctx, GL_INVALID_OPERATION, + "GL_FILL_RECTANGLE_NV must be used as both front/back " + "polygon mode or neither"); + return GL_FALSE; + } + #ifdef DEBUG if (ctx->_Shader->Flags & GLSL_LOG) { struct gl_program **prog = ctx->_Shader->CurrentProgram; diff --git a/src/mesa/main/extensions_table.h b/src/mesa/main/extensions_table.h index ec717912cb8..f2eac2b1b52 100644 --- a/src/mesa/main/extensions_table.h +++ b/src/mesa/main/extensions_table.h @@ -320,6 +320,7 @@ EXT(NV_conditional_render , NV_conditional_render EXT(NV_depth_clamp , ARB_depth_clamp , GLL, GLC, x , x , 2001) EXT(NV_draw_buffers , dummy_true , x , x , x , ES2, 2011) EXT(NV_fbo_color_attachments , dummy_true , x , x , x , ES2, 2010) +EXT(NV_fill_rectangle , NV_fill_rectangle , GLL, GLC, x , x , 2015) EXT(NV_fog_distance , NV_fog_distance , GLL, x , x , x , 2001) EXT(NV_image_formats , ARB_shader_image_load_store , x , x , x , 31, 2014) EXT(NV_light_max_exponent , dummy_true , GLL, x , x , x , 1999) diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 401c35a31b7..6fb6a514f9f 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -4014,6 +4014,7 @@ struct gl_extensions GLboolean MESA_shader_integer_functions; GLboolean MESA_ycbcr_texture; GLboolean NV_conditional_render; + GLboolean NV_fill_rectangle; GLboolean NV_fog_distance; GLboolean NV_point_sprite; GLboolean NV_primitive_restart; diff --git a/src/mesa/main/polygon.c b/src/mesa/main/polygon.c index 4caf62adfea..1bb7190bc24 100644 --- a/src/mesa/main/polygon.c +++ b/src/mesa/main/polygon.c @@ -131,8 +131,17 @@ _mesa_PolygonMode( GLenum face, GLenum mode ) _mesa_enum_to_string(face), _mesa_enum_to_string(mode)); - if (mode!=GL_POINT && mode!=GL_LINE && mode!=GL_FILL) { - _mesa_error( ctx, GL_INVALID_ENUM, "glPolygonMode(mode)" ); + switch (mode) { + case GL_POINT: + case GL_LINE: + case GL_FILL: + break; + case GL_FILL_RECTANGLE_NV: + if (ctx->Extensions.NV_fill_rectangle) + break; + /* fall-through */ + default: + _mesa_error(ctx, GL_INVALID_ENUM, "glPolygonMode(mode)"); return; } |