From: Mathias Fröhlich <mathias.froehlich@web.de>
Date: Mon, 29 Apr 2019 05:23:58 +0000 (+0200)
Subject: mesa: Set CurrentSavePrimitive in vbo_save_NotifyBegin.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5ad54217ff88e34706995b8645a1be35e0c76441;p=mesa.git

mesa: Set CurrentSavePrimitive in vbo_save_NotifyBegin.

That seems to be lost somewhere. Is needed for correct outside begin/end
detection in display list compilation. And is needed for correct aliasing
in dlists restablished in the next changes.

Reviewed-by: Brian Paul <brianp@vmware.com>
Signed-off-by: Mathias Fröhlich <Mathias.Froehlich@web.de>
---

diff --git a/src/mesa/vbo/vbo_save_api.c b/src/mesa/vbo/vbo_save_api.c
index f9f0e641a5d..b33dfa5fd8e 100644
--- a/src/mesa/vbo/vbo_save_api.c
+++ b/src/mesa/vbo/vbo_save_api.c
@@ -1198,6 +1198,8 @@ vbo_save_NotifyBegin(struct gl_context *ctx, GLenum mode,
    struct vbo_save_context *save = &vbo_context(ctx)->save;
    const GLuint i = save->prim_count++;
 
+   ctx->Driver.CurrentSavePrimitive = mode;
+
    assert(i < save->prim_max);
    save->prims[i].mode = mode & VBO_SAVE_PRIM_MODE_MASK;
    save->prims[i].begin = 1;