Mesa (master): mesa: Flush vertices before changing the OpenGL state.
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Feb 27 06:52:10 UTC 2020
Module: Mesa
Branch: master
Commit: 636656bcd7801c703ebcf9bd4c65197e4e6cbee8
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=636656bcd7801c703ebcf9bd4c65197e4e6cbee8
Author: Mathias Fröhlich <mathias.froehlich at web.de>
Date: Wed Feb 26 07:49:27 2020 +0100
mesa: Flush vertices before changing the OpenGL state.
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
CC: <mesa-stable at lists.freedesktop.org>
Signed-off-by: Mathias Fröhlich <Mathias.Froehlich at 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>
---
src/mesa/main/conservativeraster.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/mesa/main/conservativeraster.c b/src/mesa/main/conservativeraster.c
index 9068a00b4c9..d27c21c1f36 100644
--- a/src/mesa/main/conservativeraster.c
+++ b/src/mesa/main/conservativeraster.c
@@ -59,6 +59,11 @@ conservative_raster_parameter(GLenum pname, GLfloat param,
_mesa_error(ctx, GL_INVALID_VALUE, "%s(param=%g)", func, param);
return;
}
+
+ FLUSH_VERTICES(ctx, 0);
+ ctx->NewDriverState |=
+ ctx->DriverFlags.NewNvConservativeRasterizationParams;
+
ctx->ConservativeRasterDilate =
CLAMP(param,
ctx->Const.ConservativeRasterDilateRange[0],
@@ -74,6 +79,11 @@ conservative_raster_parameter(GLenum pname, GLfloat param,
"%s(pname=%s)", func, _mesa_enum_to_string(param));
return;
}
+
+ FLUSH_VERTICES(ctx, 0);
+ ctx->NewDriverState |=
+ ctx->DriverFlags.NewNvConservativeRasterizationParams;
+
ctx->ConservativeRasterMode = param;
break;
default:
@@ -81,10 +91,6 @@ conservative_raster_parameter(GLenum pname, GLfloat param,
break;
}
- FLUSH_VERTICES(ctx, 0);
- ctx->NewDriverState |=
- ctx->DriverFlags.NewNvConservativeRasterizationParams;
-
return;
invalid_pname_enum:
if (!no_error)
More information about the mesa-commit
mailing list