intel: Use separate stencil whenever possible

For depthstencil renderbuffers, we were using separate stencil only if the
hardware required it. Since the performance gains from HiZ is so high, we
should always use separate stencil if the hardware supports it.

Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>

diff --git a/src/mesa/drivers/dri/intel/intel_fbo.c b/src/mesa/drivers/dri/intel/intel_fbo.c
index c96430d..dc3e5dd 100644 (file)
--- a/src/mesa/drivers/dri/intel/intel_fbo.c
+++ b/src/mesa/drivers/dri/intel/intel_fbo.c
@@ -669,7 +669,7 @@ intel_alloc_renderbuffer_storage(struct gl_context * ctx, struct gl_renderbuffer
         return false;
 
    } else if (irb->Base.Format == MESA_FORMAT_S8_Z24
-             && intel->must_use_separate_stencil) {
+             && intel->has_separate_stencil) {
 
       bool ok = true;
       struct gl_renderbuffer *depth_rb;

diff --git a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
index f875edb..f8ef262 100644 (file)
--- a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
+++ b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
@@ -119,7 +119,7 @@ intel_miptree_create_internal(struct intel_context *intel,
    brw_miptree_layout(intel, mt);
 #endif
 
-   if (intel->must_use_separate_stencil &&
+   if (intel->has_separate_stencil &&
        _mesa_is_depthstencil_format(_mesa_get_format_base_format(format))) {
       mt->stencil_mt = intel_miptree_create(intel,
                                             mt->target,