Mesa (master): svga: move assertion in draw_vgpu10()

Brian Paul brianp at kemper.freedesktop.org
Mon Jul 3 16:17:02 UTC 2017


Module: Mesa
Branch: master
Commit: 6b4bf7e8be3cc0f350c701efa67313197881cf99
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6b4bf7e8be3cc0f350c701efa67313197881cf99

Author: Brian Paul <brianp at vmware.com>
Date:   Fri Jun 30 14:07:08 2017 -0700

svga: move assertion in draw_vgpu10()

The buffer binding flags aren't ensured until after the
svga_buffer_handle() call, so move the assertion after it.

Reviewed-by: Charmaine Lee <charmainel at vmware.com>

---

 src/gallium/drivers/svga/svga_draw.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/svga/svga_draw.c b/src/gallium/drivers/svga/svga_draw.c
index 6510c42443..5919bd35da 100644
--- a/src/gallium/drivers/svga/svga_draw.c
+++ b/src/gallium/drivers/svga/svga_draw.c
@@ -548,9 +548,9 @@ draw_vgpu10(struct svga_hwtnl *hwtnl,
       struct svga_buffer *sbuf = svga_buffer(hwtnl->cmd.vbufs[i].buffer.resource);
 
       if (sbuf) {
-         assert(sbuf->key.flags & SVGA3D_SURFACE_BIND_VERTEX_BUFFER);
          vbuffer_handles[i] = svga_buffer_handle(svga, &sbuf->b.b,
                                                  PIPE_BIND_VERTEX_BUFFER);
+         assert(sbuf->key.flags & SVGA3D_SURFACE_BIND_VERTEX_BUFFER);
          if (vbuffer_handles[i] == NULL)
             return PIPE_ERROR_OUT_OF_MEMORY;
          vbuffers[i] = &sbuf->b.b;




More information about the mesa-commit mailing list