summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Olšák <marek.olsak@amd.com>2020-02-13 23:14:47 -0500
committerDylan Baker <dylan@pnwbakers.com>2020-02-20 13:36:37 -0800
commit735a90abe50bb288eabfdd71f48cd229754ce62d (patch)
tree51f269d5885d6c461a1493fa7a2004faef771b1c
parent6d93c67532338f184ba60d6ae1d2dee7c5b338f0 (diff)
mesa: fix immediate mode with tessellation and varying patch vertices
Cc: 19.3 20.0 <mesa-stable@lists.freedesktop.org> Reviewed-by: Mathias Fröhlich <mathias.froehlich@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)
-rw-r--r--.pick_status.json2
-rw-r--r--src/mesa/main/shaderapi.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/.pick_status.json b/.pick_status.json
index 3f176a18ba9..12c3930eaff 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 8bca17a9352..d2f59778463 100644
--- a/src/mesa/main/shaderapi.c
+++ b/src/mesa/main/shaderapi.c
@@ -2658,6 +2658,7 @@ void GLAPIENTRY
_mesa_PatchParameteri_no_error(GLenum pname, GLint value)
{
GET_CURRENT_CONTEXT(ctx);
+ FLUSH_VERTICES(ctx, 0);
ctx->TessCtrlProgram.patch_vertices = value;
}
@@ -2682,6 +2683,7 @@ _mesa_PatchParameteri(GLenum pname, GLint value)
return;
}
+ FLUSH_VERTICES(ctx, 0);
ctx->TessCtrlProgram.patch_vertices = value;
}