From f4ab7340ca72f6b61fe6e3e0995360546d2d6287 Mon Sep 17 00:00:00 2001 From: Ben Widawsky Date: Wed, 30 Dec 2015 09:47:17 -0800 Subject: [PATCH] i965: Remove unused hw_must_use_separate_stencil I spotted this while looking for what needs updating in future platforms. I'm too lazy to go through the git logs, but it was probably missed by Jason when all the brw refactoring happened. Signed-off-by: Ben Widawsky Reviewed-by: Kenneth Graunke --- src/mesa/drivers/dri/i965/brw_context.c | 2 +- src/mesa/drivers/dri/i965/intel_screen.c | 2 -- src/mesa/drivers/dri/i965/intel_screen.h | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c index 4298252c9b7..9ba33396d36 100644 --- a/src/mesa/drivers/dri/i965/brw_context.c +++ b/src/mesa/drivers/dri/i965/brw_context.c @@ -812,7 +812,7 @@ brwCreateContext(gl_api api, brw->needs_unlit_centroid_workaround = devinfo->needs_unlit_centroid_workaround; - brw->must_use_separate_stencil = screen->hw_must_use_separate_stencil; + brw->must_use_separate_stencil = devinfo->must_use_separate_stencil; brw->has_swizzling = screen->hw_has_swizzling; brw->vs.base.stage = MESA_SHADER_VERTEX; diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c index a9f58b09422..e1e1e62d26a 100644 --- a/src/mesa/drivers/dri/i965/intel_screen.c +++ b/src/mesa/drivers/dri/i965/intel_screen.c @@ -1449,8 +1449,6 @@ __DRIconfig **intelInitScreen2(__DRIscreen *psp) if (INTEL_DEBUG & DEBUG_AUB) drm_intel_bufmgr_gem_set_aub_dump(intelScreen->bufmgr, true); - intelScreen->hw_must_use_separate_stencil = intelScreen->devinfo->gen >= 7; - intelScreen->hw_has_swizzling = intel_detect_swizzling(intelScreen); intelScreen->hw_has_timestamp = intel_detect_timestamp(intelScreen); diff --git a/src/mesa/drivers/dri/i965/intel_screen.h b/src/mesa/drivers/dri/i965/intel_screen.h index 96bb995d66f..3a5f22c3a67 100644 --- a/src/mesa/drivers/dri/i965/intel_screen.h +++ b/src/mesa/drivers/dri/i965/intel_screen.h @@ -46,8 +46,6 @@ struct intel_screen bool no_hw; - bool hw_must_use_separate_stencil; - bool hw_has_swizzling; int hw_has_timestamp; -- 2.30.2