projects
/
profile
/
ivi
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2b3e1ad
)
llvmpipe: another null pointer check
author
Brian Paul
<brianp@vmware.com>
Wed, 30 Jun 2010 17:56:56 +0000
(11:56 -0600)
committer
Brian Paul
<brianp@vmware.com>
Wed, 30 Jun 2010 20:05:45 +0000
(14:05 -0600)
src/gallium/drivers/llvmpipe/lp_texture.c
patch
|
blob
|
history
diff --git
a/src/gallium/drivers/llvmpipe/lp_texture.c
b/src/gallium/drivers/llvmpipe/lp_texture.c
index
a156bb6
..
1d42bdd
100644
(file)
--- 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],