From: Brian Paul <brianp@vmware.com>
Date: Mon, 22 Feb 2016 15:53:47 +0000 (-0700)
Subject: svga: unbind index buffer when drawing non-indexed primitives
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9de3b0273d4fc01f5fdb5e9c9301a42575694d88;p=mesa.git

svga: unbind index buffer when drawing non-indexed primitives

Silences a warning reported by the svga3d device.

v2: also null-out the index buffer pointer

Reviewed-by: Sinclair Yeh <syeh@vmware.com>
Reviewed-by: Charmaine Lee <charmainel@vmware.com>
---

diff --git a/src/gallium/drivers/svga/svga_draw.c b/src/gallium/drivers/svga/svga_draw.c
index 80526ed4d15..fe6cf71a6e5 100644
--- a/src/gallium/drivers/svga/svga_draw.c
+++ b/src/gallium/drivers/svga/svga_draw.c
@@ -590,6 +590,16 @@ draw_vgpu10(struct svga_hwtnl *hwtnl,
    }
    else {
       /* non-indexed drawing */
+      if (svga->state.hw_draw.ib_format != SVGA3D_FORMAT_INVALID) {
+         /* Unbind previously bound index buffer */
+         ret = SVGA3D_vgpu10_SetIndexBuffer(svga->swc, NULL,
+                                            SVGA3D_FORMAT_INVALID, 0);
+         if (ret != PIPE_OK)
+            return ret;
+         svga->state.hw_draw.ib_format = SVGA3D_FORMAT_INVALID;
+         svga->state.hw_draw.ib = NULL;
+      }
+
       if (instance_count > 1) {
          ret = SVGA3D_vgpu10_DrawInstanced(svga->swc,
                                            vcount,