Combing depth and stencil objects and making them immutable.

Converting depth and stencil objects into a single state object
(d3d10 like) and making it immutable.

1 files changed, 4 insertions, 4 deletions

diff --git a/src/mesa/pipe/softpipe/sp_quad.c b/src/mesa/pipe/softpipe/sp_quad.c
index 2fcbea1f22e..1f45776d477 100644
--- a/src/mesa/pipe/softpipe/sp_quad.c
+++ b/src/mesa/pipe/softpipe/sp_quad.c
@@ -31,7 +31,7 @@ sp_build_quad_pipeline(struct softpipe_context *sp)
       sp->quad.first = sp->quad.bufloop;
    }
 
-   if (sp->depth_test.occlusion_count) {
+   if (sp->depth_stencil->depth.occlusion_count) {
       sp->quad.occlusion->next = sp->quad.first;
       sp->quad.first = sp->quad.occlusion;
    }
@@ -43,12 +43,12 @@ sp_build_quad_pipeline(struct softpipe_context *sp)
       sp->quad.first = sp->quad.coverage;
    }
 
-   if (   sp->stencil.front_enabled
-       || sp->stencil.front_enabled) {
+   if (   sp->depth_stencil->stencil.front_enabled
+       || sp->depth_stencil->stencil.back_enabled) {
       sp->quad.stencil_test->next = sp->quad.first;
       sp->quad.first = sp->quad.stencil_test;
    }
-   else if (sp->depth_test.enabled &&
+   else if (sp->depth_stencil->depth.enabled &&
             sp->framebuffer.zbuf) {
       sp->quad.depth_test->next = sp->quad.first;
       sp->quad.first = sp->quad.depth_test;