summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/r600/r600_state.c
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2012-09-13 00:45:05 +0200
committerMarek Olšák <[email protected]>2012-09-30 18:57:57 +0200
commitfc887d687b0598e09de76be885652d96e20ae07e (patch)
tree2abc8b44a3d0a02461ee3649382ef773d50f9e98 /src/gallium/drivers/r600/r600_state.c
parent95b777e688e438813e892b0948b8cead5197a323 (diff)
r600g: implement blit
Tested-by: Michel Dänzer <[email protected]> Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/gallium/drivers/r600/r600_state.c')
-rw-r--r--src/gallium/drivers/r600/r600_state.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/gallium/drivers/r600/r600_state.c b/src/gallium/drivers/r600/r600_state.c
index 60c861fc8e0..3347e6d872f 100644
--- a/src/gallium/drivers/r600/r600_state.c
+++ b/src/gallium/drivers/r600/r600_state.c
@@ -593,7 +593,8 @@ boolean r600_is_format_supported(struct pipe_screen *screen,
return FALSE;
/* MSAA integer colorbuffers hang. */
- if (util_format_is_pure_integer(format))
+ if (util_format_is_pure_integer(format) &&
+ !util_format_is_depth_or_stencil(format))
return FALSE;
switch (sample_count) {
@@ -1156,12 +1157,10 @@ static void r600_pipe_set_scissor_state(struct pipe_context *ctx,
{
struct r600_context *rctx = (struct r600_context *)ctx;
- if (rctx->chip_class == R600) {
- rctx->scissor_state = *state;
+ rctx->scissor = *state;
- if (!rctx->scissor_enable)
- return;
- }
+ if (rctx->chip_class == R600 && !rctx->scissor_enable)
+ return;
r600_set_scissor_state(rctx, state);
}