diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-03-13 13:39:05 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-03-13 13:39:05 +1100 |
| commit | 03ec66375889f049b09f39ba98515aa35ac48164 (patch) | |
| tree | e149d8defb52b1252af982b459902ee0800b17cd /src/gallium/drivers/cell/ppu/cell_state_emit.c | |
| parent | bd4fe0e87c1b979973d9a76aa48de5fbbb8d52b7 (diff) | |
| parent | 2366bb1baf2e9ae5b6ecf19f66ae9e0a4b0d2f36 (diff) | |
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'src/gallium/drivers/cell/ppu/cell_state_emit.c')
| -rw-r--r-- | src/gallium/drivers/cell/ppu/cell_state_emit.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gallium/drivers/cell/ppu/cell_state_emit.c b/src/gallium/drivers/cell/ppu/cell_state_emit.c index 49c0d130c5..670eb26bdd 100644 --- a/src/gallium/drivers/cell/ppu/cell_state_emit.c +++ b/src/gallium/drivers/cell/ppu/cell_state_emit.c @@ -77,8 +77,10 @@ cell_emit_state(struct cell_context *cell) } if (cell->dirty & CELL_NEW_SAMPLER) { - emit_state_cmd(cell, CELL_CMD_STATE_SAMPLER, - cell->sampler[0], sizeof(struct pipe_sampler_state)); + if (cell->sampler[0]) { + emit_state_cmd(cell, CELL_CMD_STATE_SAMPLER, + cell->sampler[0], sizeof(struct pipe_sampler_state)); + } } if (cell->dirty & CELL_NEW_TEXTURE) { |