Mesa (master): llvmpipe: another null pointer check

Brian Paul brianp at kemper.freedesktop.org
Wed Jun 30 13:10:55 PDT 2010


Module: Mesa
Branch: master
Commit: fb06b543a52c33c10594437ebed2c5e306dc7382
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=fb06b543a52c33c10594437ebed2c5e306dc7382

Author: Brian Paul <brianp at vmware.com>
Date:   Wed Jun 30 11:56:56 2010 -0600

llvmpipe: another null pointer check

---

 src/gallium/drivers/llvmpipe/lp_texture.c |    2 +-
 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 a156bb6..1d42bdd 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],



More information about the mesa-commit mailing list