From: Corbin Simpson <MostAwesomeDude@gmail.com>
Date: Thu, 2 Jul 2009 23:31:24 +0000 (-0700)
Subject: vbo: If MapBufferRange fails, try MapBuffer instead.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9a0b570ab64169cee66f848d97d65f22c43d13ec;p=mesa.git

vbo: If MapBufferRange fails, try MapBuffer instead.

Fixes segfaults with radeon winsys.
(Probably libdrm_radeon doing something that it shouldn't.)
---

diff --git a/src/mesa/vbo/vbo_exec_draw.c b/src/mesa/vbo/vbo_exec_draw.c
index 5442a409ad4..bfe9ef0a483 100644
--- a/src/mesa/vbo/vbo_exec_draw.c
+++ b/src/mesa/vbo/vbo_exec_draw.c
@@ -327,9 +327,10 @@ vbo_exec_vtx_map( struct vbo_exec_context *exec )
                                                   0, VBO_VERT_BUFFER_SIZE,
                                                   accessRange,
                                                   exec->vtx.bufferobj);
-      else
+      if (!exec->vtx.buffer_map)
          exec->vtx.buffer_map =
             (GLfloat *)ctx->Driver.MapBuffer(ctx, target, access, exec->vtx.bufferobj);
+      assert(exec->vtx.buffer_map);
       exec->vtx.buffer_ptr = exec->vtx.buffer_map;
    }