Merge branch 'gallium-polygon-stipple'

[mesa.git] / src / gallium / drivers / softpipe / sp_quad_depth_test.c

diff --git a/src/gallium/drivers/softpipe/sp_quad_depth_test.c b/src/gallium/drivers/softpipe/sp_quad_depth_test.c
index 15f3a8fd813903fb74416c21bfb361b32b9a2c9c..a349f0d1f3c9e5a2c937967d661bcd248d67760b 100644 (file)
--- a/src/gallium/drivers/softpipe/sp_quad_depth_test.c
+++ b/src/gallium/drivers/softpipe/sp_quad_depth_test.c
@@ -727,9 +727,9 @@ depth_test_quads_fallback(struct quad_stage *qs,
                           unsigned nr)
 {
    unsigned i, pass = 0;
                           unsigned nr)
 {
    unsigned i, pass = 0;

-   const struct sp_fragment_shader *fs = qs->softpipe->fs;
-   boolean interp_depth = !fs->info.writes_z;
-   boolean shader_stencil_ref = fs->info.writes_stencil;
+   const struct tgsi_shader_info *fsInfo = &qs->softpipe->fs_variant->info;
+   boolean interp_depth = !fsInfo->writes_z;
+   boolean shader_stencil_ref = fsInfo->writes_stencil;

    struct depth_data data;
 
    data.use_shader_stencil_refs = FALSE;
    struct depth_data data;
 
    data.use_shader_stencil_refs = FALSE;


@@ -838,7 +838,9 @@ choose_depth_test(struct quad_stage *qs,
                   struct quad_header *quads[],
                   unsigned nr)
 {
                   struct quad_header *quads[],
                   unsigned nr)
 {

-   boolean interp_depth = !qs->softpipe->fs->info.writes_z;
+   const struct tgsi_shader_info *fsInfo = &qs->softpipe->fs_variant->info;
+
+   boolean interp_depth = !fsInfo->writes_z;

 
    boolean alpha = qs->softpipe->depth_stencil->alpha.enabled;
 
 
    boolean alpha = qs->softpipe->depth_stencil->alpha.enabled;