This driver is in maintenance mode so lets remove this hidden
unsafe option.
---
src/mesa/drivers/dri/i915/i915_vtbl.c | 8 --------
src/mesa/drivers/dri/i915/intel_context.c | 2 --
src/mesa/drivers/dri/i915/intel_context.h | 2 --
src/mesa/drivers/dri/i915/intel_screen.c | 4 ----
4 files changed, 16 deletions(-)
diff --git a/src/mesa/drivers/dri/i915/i915_vtbl.c
b/src/mesa/drivers/dri/i915/i915_vtbl.c
index 6a0a121856d..562c83a665f 100644
--- a/src/mesa/drivers/dri/i915/i915_vtbl.c
+++ b/src/mesa/drivers/dri/i915/i915_vtbl.c
@@ -609,14 +609,6 @@ i915_set_draw_region(struct intel_context *intel,
value |= DV_PF_8888;
}
- /* This isn't quite safe, thus being hidden behind an option. When changing
- * the value of this bit, the pipeline needs to be MI_FLUSHed. And it
- * can only be set when a depth buffer is already defined.
- */
- if (intel->is_945 && intel->use_early_z &&
- depth_region->tiling != I915_TILING_NONE)
- value |= CLASSIC_EARLY_DEPTH;
-
if (depth_region && depth_region->cpp == 4) {
value |= DEPTH_FRMT_24_FIXED_8_OTHER;
}
diff --git a/src/mesa/drivers/dri/i915/intel_context.c
b/src/mesa/drivers/dri/i915/intel_context.c
index 9a6e49dd827..728d6d58699 100644
--- a/src/mesa/drivers/dri/i915/intel_context.c
+++ b/src/mesa/drivers/dri/i915/intel_context.c
@@ -532,8 +532,6 @@ intelInitContext(struct intel_context *intel,
intel_fbo_init(intel);
- intel->use_early_z = driQueryOptionb(&intel->optionCache, "early_z");
-
intel->prim.primitive = ~0;
/* Force all software fallbacks */
diff --git a/src/mesa/drivers/dri/i915/intel_context.h
b/src/mesa/drivers/dri/i915/intel_context.h
index a8339896f65..580af53f956 100644
--- a/src/mesa/drivers/dri/i915/intel_context.h
+++ b/src/mesa/drivers/dri/i915/intel_context.h
@@ -238,8 +238,6 @@ struct intel_context
*/
bool front_buffer_dirty;
- bool use_early_z;
-
__DRIcontext *driContext;
struct intel_screen *intelScreen;
diff --git a/src/mesa/drivers/dri/i915/intel_screen.c
b/src/mesa/drivers/dri/i915/intel_screen.c
index 27be9219e47..3d4f7ae94aa 100644
--- a/src/mesa/drivers/dri/i915/intel_screen.c
+++ b/src/mesa/drivers/dri/i915/intel_screen.c
@@ -57,10 +57,6 @@ DRI_CONF_BEGIN
DRI_CONF_DESC_END
DRI_CONF_OPT_END
- DRI_CONF_OPT_BEGIN_B(early_z, "false")
- DRI_CONF_DESC(en, "Enable early Z in classic mode (unstable,
945-only).")
- DRI_CONF_OPT_END
-
DRI_CONF_OPT_BEGIN_B(fragment_shader, "true")
DRI_CONF_DESC(en, "Enable limited ARB_fragment_shader support on
915/945.")
DRI_CONF_OPT_END
--
2.17.1
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
