From cc57baff5f40ba0ab3d3044c4fcd867e5b0e640e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Kristian=20H=C3=B8gsberg?= Date: Thu, 11 Feb 2010 16:50:46 -0500 Subject: [PATCH] i915: Remove always-true irq_active struct intel_screen field --- src/mesa/drivers/dri/intel/intel_context.c | 5 ----- src/mesa/drivers/dri/intel/intel_screen.c | 1 - src/mesa/drivers/dri/intel/intel_screen.h | 2 -- 3 files changed, 8 deletions(-) diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c index 7e5f4f163df..e9315a50fe7 100644 --- a/src/mesa/drivers/dri/intel/intel_context.c +++ b/src/mesa/drivers/dri/intel/intel_context.c @@ -718,11 +718,6 @@ intelInitContext(struct intel_context *intel, intel->RenderIndex = ~0; - if (intel->gen >= 4 && !intel->intelScreen->irq_active) { - _mesa_printf("IRQs not active. Exiting\n"); - exit(1); - } - intelInitExtensions(ctx); INTEL_DEBUG = driParseDebugString(getenv("INTEL_DEBUG"), debug_control); diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c index 221e40c0a5b..6dc20d0fefe 100644 --- a/src/mesa/drivers/dri/intel/intel_screen.c +++ b/src/mesa/drivers/dri/intel/intel_screen.c @@ -368,7 +368,6 @@ __DRIconfig **intelInitScreen2(__DRIscreen *psp) if (!intel_init_bufmgr(intelScreen)) return GL_FALSE; - intelScreen->irq_active = 1; psp->extensions = intelScreenExtensions; msaa_samples_array[0] = 0; diff --git a/src/mesa/drivers/dri/intel/intel_screen.h b/src/mesa/drivers/dri/intel/intel_screen.h index 4c9579afa71..c31b8365525 100644 --- a/src/mesa/drivers/dri/intel/intel_screen.h +++ b/src/mesa/drivers/dri/intel/intel_screen.h @@ -42,8 +42,6 @@ struct intel_screen __DRIscreen *driScrnPriv; - int irq_active; - GLboolean no_hw; GLboolean no_vbo; -- 2.30.2