From: José Fonseca <jfonseca@vmware.com>
Date: Wed, 9 Nov 2011 18:58:28 +0000 (+0000)
Subject: draw: Handle failure to allocate aligned_constant_storage.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9e29cdbe95810de8658dfd1cabf1a7d87264c2f7;p=mesa.git

draw: Handle failure to allocate aligned_constant_storage.

Also, actually update const_storage_size, therefore avoiding to
unnecessarily reallocate aligned_constant_storage every single time
draw_vs_set_constants() is called.

Reviewed-by: Brian Paul <brianp@vmware.com>
---

diff --git a/src/gallium/auxiliary/draw/draw_vs.c b/src/gallium/auxiliary/draw/draw_vs.c
index 957bbe57a82..bc1c90b0f3a 100644
--- a/src/gallium/auxiliary/draw/draw_vs.c
+++ b/src/gallium/auxiliary/draw/draw_vs.c
@@ -69,14 +69,20 @@ draw_vs_set_constants(struct draw_context *draw,
       if (size > draw->vs.const_storage_size[slot]) {
          if (draw->vs.aligned_constant_storage[slot]) {
             align_free((void *)draw->vs.aligned_constant_storage[slot]);
+            draw->vs.const_storage_size[slot] = 0;
          }
          draw->vs.aligned_constant_storage[slot] =
             align_malloc(size, alignment);
+         if (draw->vs.aligned_constant_storage[slot]) {
+            draw->vs.const_storage_size[slot] = size;
+         }
       }
       assert(constants);
-      memcpy((void *)draw->vs.aligned_constant_storage[slot],
-             constants,
-             size);
+      if (draw->vs.aligned_constant_storage[slot]) {
+         memcpy((void *)draw->vs.aligned_constant_storage[slot],
+                constants,
+                size);
+      }
       constants = draw->vs.aligned_constant_storage[slot];
    }