Mesa (staging/20.0): mesa: fix immediate mode with tessellation and varying patch vertices
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Feb 20 21:35:52 UTC 2020
Module: Mesa
Branch: staging/20.0
Commit: 387ee33305140981d263956e756117429b50c090
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=387ee33305140981d263956e756117429b50c090
Author: Marek Olšák <marek.olsak at amd.com>
Date: Thu Feb 13 23:14:47 2020 -0500
mesa: fix immediate mode with tessellation and varying patch vertices
Cc: 19.3 20.0 <mesa-stable at lists.freedesktop.org>
Reviewed-by: Mathias Fröhlich <mathias.froehlich at web.de>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3861>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3861>
(cherry picked from commit 2e05a280b6b6d334388e3824bd82472ccbf33252)
---
.pick_status.json | 2 +-
src/mesa/main/shaderapi.c | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/.pick_status.json b/.pick_status.json
index e83836d2a10..1cd9ef028be 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -418,7 +418,7 @@
"description": "mesa: fix immediate mode with tessellation and varying patch vertices",
"nominated": true,
"nomination_type": 0,
- "resolution": 0,
+ "resolution": 1,
"master_sha": null,
"because_sha": null
},
diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
index 0d3c0de908e..ab81775f57d 100644
--- a/src/mesa/main/shaderapi.c
+++ b/src/mesa/main/shaderapi.c
@@ -2660,6 +2660,7 @@ void GLAPIENTRY
_mesa_PatchParameteri_no_error(GLenum pname, GLint value)
{
GET_CURRENT_CONTEXT(ctx);
+ FLUSH_VERTICES(ctx, 0);
ctx->TessCtrlProgram.patch_vertices = value;
}
@@ -2684,6 +2685,7 @@ _mesa_PatchParameteri(GLenum pname, GLint value)
return;
}
+ FLUSH_VERTICES(ctx, 0);
ctx->TessCtrlProgram.patch_vertices = value;
}
More information about the mesa-commit
mailing list