From 9e29cdbe95810de8658dfd1cabf1a7d87264c2f7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Fonseca?= Date: Wed, 9 Nov 2011 18:58:28 +0000 Subject: [PATCH] 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 --- src/gallium/auxiliary/draw/draw_vs.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/gallium/auxiliary/draw/draw_vs.c b/src/gallium/auxiliary/draw/draw_vs.c index 957bbe5..bc1c90b 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]; } -- 2.7.4