fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 02:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

mesa: Flush vertices before changing the OpenGL state.

Browse source 
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
CC: <mesa-stable@lists.freedesktop.org>
Signed-off-by: Mathias Fröhlich <Mathias.Froehlich@web.de>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3958>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3958>
(cherry picked from commit 636656bcd7)
This commit is contained in:
Mathias Fröhlich 2020-02-26 07:49:27 +01:00 • committed by Dylan Baker
parent f1ec137ec9
commit 69edb32eaa
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -1075,7 +1075,7 @@
"description": "mesa: Flush vertices before changing the OpenGL state.", "description": "mesa: Flush vertices before changing the OpenGL state.",
"nominated": true, "nominated": true,
"nomination_type": 0, "nomination_type": 0,
"resolution": 0, "resolution": 1,
"master_sha": null, "master_sha": null,
"because_sha": null "because_sha": null
}, },

14
src/mesa/main/conservativeraster.c
View file

@ -59,6 +59,11 @@ conservative_raster_parameter(GLenum pname, GLfloat param,
_mesa_error(ctx, GL_INVALID_VALUE, "%s(param=%g)", func, param); _mesa_error(ctx, GL_INVALID_VALUE, "%s(param=%g)", func, param);
return; return;
} }
FLUSH_VERTICES(ctx, 0);
ctx->NewDriverState |=
ctx->DriverFlags.NewNvConservativeRasterizationParams;
ctx->ConservativeRasterDilate = ctx->ConservativeRasterDilate =
CLAMP(param, CLAMP(param,
ctx->Const.ConservativeRasterDilateRange[0], ctx->Const.ConservativeRasterDilateRange[0],
@ -74,6 +79,11 @@ conservative_raster_parameter(GLenum pname, GLfloat param,
"%s(pname=%s)", func, _mesa_enum_to_string(param)); "%s(pname=%s)", func, _mesa_enum_to_string(param));
return; return;
} }
FLUSH_VERTICES(ctx, 0);
ctx->NewDriverState |=
ctx->DriverFlags.NewNvConservativeRasterizationParams;
ctx->ConservativeRasterMode = param; ctx->ConservativeRasterMode = param;
break; break;
default: default:
@ -81,10 +91,6 @@ conservative_raster_parameter(GLenum pname, GLfloat param,
break; break;
} }
FLUSH_VERTICES(ctx, 0);
ctx->NewDriverState |=
ctx->DriverFlags.NewNvConservativeRasterizationParams;
return; return;
invalid_pname_enum: invalid_pname_enum:
if (!no_error) if (!no_error)