commit fb06b543a52c33c10594437ebed2c5e306dc7382
author Brian Paul <brianp@vmware.com> Wed Jun 30 11:56:56 2010 -0600
committer Brian Paul <brianp@vmware.com> Wed Jun 30 14:05:45 2010 -0600
tree 8d042fa1091be1797c63b47d79fc8485bf4b2c96
parent 2b3e1ad731d2bd095a680d3120619972a7eb0242

llvmpipe: another null pointer check

src/gallium/drivers/llvmpipe/lp_texture.c

diff --git a/src/gallium/drivers/llvmpipe/lp_texture.c b/src/gallium/drivers/llvmpipe/lp_texture.c
index a156bb6..1d42bdd 100644
--- a/src/gallium/drivers/llvmpipe/lp_texture.c
+++ b/src/gallium/drivers/llvmpipe/lp_texture.c
@@ -1135,7 +1135,7 @@
    layout_logic(cur_layout, LP_TEX_LAYOUT_LINEAR, usage,
                 &new_layout, &convert);
 
-   if (convert) {
+   if (convert && tiled_image && linear_image) {
       lp_tiled_to_linear(tiled_image, linear_image,
                          x, y, TILE_SIZE, TILE_SIZE, lpr->base.format,
                          lpr->row_stride[level],