summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2010-06-30 11:56:56 -0600
committerBrian Paul <brianp@vmware.com>2010-06-30 14:05:45 -0600
commitfb06b543a52c33c10594437ebed2c5e306dc7382 (patch)
tree8d042fa1091be1797c63b47d79fc8485bf4b2c96
parent2b3e1ad731d2bd095a680d3120619972a7eb0242 (diff)
llvmpipe: another null pointer check
-rw-r--r--src/gallium/drivers/llvmpipe/lp_texture.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/llvmpipe/lp_texture.c b/src/gallium/drivers/llvmpipe/lp_texture.c
index a156bb6517b..1d42bdde4e2 100644
--- a/src/gallium/drivers/llvmpipe/lp_texture.c
+++ b/src/gallium/drivers/llvmpipe/lp_texture.c
@@ -1135,7 +1135,7 @@ llvmpipe_get_texture_tile_linear(struct llvmpipe_resource *lpr,
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],