From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Subject: [PATCH 08/16] intel: Replace single use of IS_965 with gen check Date: Tue, 7 Jun 2011 15:34:13 -0400 Message-ID: <1307475261-32695-9-git-send-email-krh@bitplanet.net> References: <1307475261-32695-1-git-send-email-krh@bitplanet.net> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 00D229F6FF for ; Tue, 7 Jun 2011 12:36:06 -0700 (PDT) In-Reply-To: <1307475261-32695-1-git-send-email-krh@bitplanet.net> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org --- src/mesa/drivers/dri/intel/intel_chipset.h | 6 ------ src/mesa/drivers/dri/intel/intel_context.c | 2 +- 2 files changed, 1 insertions(+), 7 deletions(-) diff --git a/src/mesa/drivers/dri/intel/intel_chipset.h b/src/mesa/drivers/dri/intel/intel_chipset.h index 37239fc..ca386b5 100644 --- a/src/mesa/drivers/dri/intel/intel_chipset.h +++ b/src/mesa/drivers/dri/intel/intel_chipset.h @@ -124,9 +124,3 @@ #define IS_IVYBRIDGE(devid) (IS_IVB_GT1(devid) || IS_IVB_GT2(devid)) #define IS_GEN7(devid) IS_IVYBRIDGE(devid) - -#define IS_965(devid) (IS_GEN4(devid) || \ - IS_G4X(devid) || \ - IS_GEN5(devid) || \ - IS_GEN6(devid) || \ - IS_GEN7(devid)) diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c index 453292c..acf7182 100644 --- a/src/mesa/drivers/dri/intel/intel_context.c +++ b/src/mesa/drivers/dri/intel/intel_context.c @@ -725,7 +725,7 @@ intelInitContext(struct intel_context *intel, } else if (IS_GEN5(intel->intelScreen->deviceID)) { intel->needs_ff_sync = GL_TRUE; intel->has_luminance_srgb = GL_TRUE; - } else if (IS_965(intel->intelScreen->deviceID)) { + } else if (intel->intelScreen->chipset.gen == 4) { if (IS_G4X(intel->intelScreen->deviceID)) { intel->has_luminance_srgb = GL_TRUE; intel->is_g4x = GL_TRUE; -- 1.7.4.4