KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mesa/main: correct extension-checks for MESA_tile_raster_order 

This extension isn't enabled for GLES 1.x, so we shouldn't allow the
state there. Let's use the extension-helpers instead of CHECK_EXTENSION
for this.

Signed-off-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Erik Faye-Lund 2019-02-25 13:14:50 +01:00
parent bf91d6ae4a
commit a33ff7876f
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/mesa/main/enable.c
View File

@ -1064,7 +1064,8 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state)
break;
case GL_TILE_RASTER_ORDER_FIXED_MESA:
CHECK_EXTENSION(MESA_tile_raster_order);
if (!_mesa_has_MESA_tile_raster_order(ctx))
goto invalid_enum_error;
if (ctx->TileRasterOrderFixed != state) {
FLUSH_VERTICES(ctx, 0);
ctx->NewDriverState |= ctx->DriverFlags.NewTileRasterOrder;
@ -1073,7 +1074,8 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state)
break;
case GL_TILE_RASTER_ORDER_INCREASING_X_MESA:
CHECK_EXTENSION(MESA_tile_raster_order);
if (!_mesa_has_MESA_tile_raster_order(ctx))
goto invalid_enum_error;
if (ctx->TileRasterOrderIncreasingX != state) {
FLUSH_VERTICES(ctx, 0);
ctx->NewDriverState |= ctx->DriverFlags.NewTileRasterOrder;
@ -1082,7 +1084,8 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state)
break;
case GL_TILE_RASTER_ORDER_INCREASING_Y_MESA:
CHECK_EXTENSION(MESA_tile_raster_order);
if (!_mesa_has_MESA_tile_raster_order(ctx))
goto invalid_enum_error;
if (ctx->TileRasterOrderIncreasingY != state) {
FLUSH_VERTICES(ctx, 0);
ctx->NewDriverState |= ctx->DriverFlags.NewTileRasterOrder;
@ -1779,15 +1782,18 @@ _mesa_IsEnabled( GLenum cap )
return ctx->ConservativeRasterization;
case GL_TILE_RASTER_ORDER_FIXED_MESA:
CHECK_EXTENSION(MESA_tile_raster_order);
if (!_mesa_has_MESA_tile_raster_order(ctx))
goto invalid_enum_error;
return ctx->TileRasterOrderFixed;
case GL_TILE_RASTER_ORDER_INCREASING_X_MESA:
CHECK_EXTENSION(MESA_tile_raster_order);
if (!_mesa_has_MESA_tile_raster_order(ctx))
goto invalid_enum_error;
return ctx->TileRasterOrderIncreasingX;
case GL_TILE_RASTER_ORDER_INCREASING_Y_MESA:
CHECK_EXTENSION(MESA_tile_raster_order);
if (!_mesa_has_MESA_tile_raster_order(ctx))
goto invalid_enum_error;
return ctx->TileRasterOrderIncreasingY;
default: