summaryrefslogtreecommitdiff
path: root/src/mesa/pipe/softpipe/sp_state_surface.c
diff options
context:
space:
mode:
authorBrian <brian.paul@tungstengraphics.com>2008-01-23 15:45:52 -0700
committerBrian <brian.paul@tungstengraphics.com>2008-01-23 15:45:52 -0700
commit8de2331e432e2ea6f978acb6c80666da99c6c4a1 (patch)
tree24d24901a45854fa3f5e37739ef6b4c6b8f784c5 /src/mesa/pipe/softpipe/sp_state_surface.c
parent1cf3c77e086d3f8b01921aae9b7309aa62b3d15e (diff)
gallium: remove support for separate depth/stencil buffers. Always combined now.
Diffstat (limited to 'src/mesa/pipe/softpipe/sp_state_surface.c')
-rw-r--r--src/mesa/pipe/softpipe/sp_state_surface.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/mesa/pipe/softpipe/sp_state_surface.c b/src/mesa/pipe/softpipe/sp_state_surface.c
index 4a9a28cc4d..e2c6893e9f 100644
--- a/src/mesa/pipe/softpipe/sp_state_surface.c
+++ b/src/mesa/pipe/softpipe/sp_state_surface.c
@@ -65,17 +65,18 @@ softpipe_set_framebuffer_state(struct pipe_context *pipe,
sp->framebuffer.num_cbufs = fb->num_cbufs;
/* zbuf changing? */
- if (sp->framebuffer.zbuf != fb->zbuf) {
+ if (sp->framebuffer.zsbuf != fb->zsbuf) {
/* flush old */
- sp_flush_tile_cache(sp, sp->zbuf_cache);
+ sp_flush_tile_cache(sp, sp->zsbuf_cache);
/* assign new */
- sp->framebuffer.zbuf = fb->zbuf;
+ sp->framebuffer.zsbuf = fb->zsbuf;
/* update cache */
- sp_tile_cache_set_surface(sp->zbuf_cache, fb->zbuf);
+ sp_tile_cache_set_surface(sp->zsbuf_cache, fb->zsbuf);
}
+#if 0
/* XXX combined depth/stencil here */
/* sbuf changing? */
@@ -98,6 +99,7 @@ softpipe_set_framebuffer_state(struct pipe_context *pipe,
sp_tile_cache_set_surface(sp->sbuf_cache, fb->sbuf);
}
}
+#endif
sp->dirty |= SP_NEW_FRAMEBUFFER;
}