From patchwork Tue Jun 7 19:34:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kristian Hogsberg X-Patchwork-Id: 859312 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p57JfKnR022356 for ; Tue, 7 Jun 2011 19:41:41 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BD8529F755 for ; Tue, 7 Jun 2011 12:41:20 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 321F29F701 for ; Tue, 7 Jun 2011 12:36:09 -0700 (PDT) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 07 Jun 2011 12:36:09 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.65,333,1304319600"; d="scan'208";a="13132566" Received: from unknown (HELO intel.com) ([10.255.12.225]) by fmsmga002.fm.intel.com with ESMTP; 07 Jun 2011 12:36:08 -0700 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= To: intel-gfx@lists.freedesktop.org Date: Tue, 7 Jun 2011 15:34:15 -0400 Message-Id: <1307475261-32695-11-git-send-email-krh@bitplanet.net> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1307475261-32695-1-git-send-email-krh@bitplanet.net> References: <1307475261-32695-1-git-send-email-krh@bitplanet.net> Subject: [Intel-gfx] [PATCH 10/16] intel: Drop unused IS_GEN5-7 macros X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 07 Jun 2011 19:41:41 +0000 (UTC) --- src/mesa/drivers/dri/intel/intel_chipset.h | 10 ---------- src/mesa/drivers/dri/intel/intel_context.c | 6 +++--- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/src/mesa/drivers/dri/intel/intel_chipset.h b/src/mesa/drivers/dri/intel/intel_chipset.h index 3e11f64..979cd0b 100644 --- a/src/mesa/drivers/dri/intel/intel_chipset.h +++ b/src/mesa/drivers/dri/intel/intel_chipset.h @@ -91,10 +91,6 @@ #define IS_GM45(devid) (devid == PCI_CHIP_GM45_GM) #define IS_G4X(devid) (IS_G45(devid) || IS_GM45(devid)) -#define IS_ILD(devid) (devid == PCI_CHIP_ILD_G) -#define IS_ILM(devid) (devid == PCI_CHIP_ILM_G) -#define IS_GEN5(devid) (IS_ILD(devid) || IS_ILM(devid)) - #define IS_SNB_GT1(devid) (devid == PCI_CHIP_SANDYBRIDGE_GT1 || \ devid == PCI_CHIP_SANDYBRIDGE_M_GT1 || \ devid == PCI_CHIP_SANDYBRIDGE_S) @@ -104,15 +100,9 @@ devid == PCI_CHIP_SANDYBRIDGE_M_GT2 || \ devid == PCI_CHIP_SANDYBRIDGE_M_GT2_PLUS) -#define IS_GEN6(devid) (IS_SNB_GT1(devid) || IS_SNB_GT2(devid)) - #define IS_IVB_GT1(devid) (devid == PCI_CHIP_IVYBRIDGE_GT1 || \ devid == PCI_CHIP_IVYBRIDGE_M_GT1 || \ devid == PCI_CHIP_IVYBRIDGE_S_GT1) #define IS_IVB_GT2(devid) (devid == PCI_CHIP_IVYBRIDGE_GT2 || \ devid == PCI_CHIP_IVYBRIDGE_M_GT2) - -#define IS_IVYBRIDGE(devid) (IS_IVB_GT1(devid) || IS_IVB_GT2(devid)) - -#define IS_GEN7(devid) IS_IVYBRIDGE(devid) diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c index acf7182..f696c3f 100644 --- a/src/mesa/drivers/dri/intel/intel_context.c +++ b/src/mesa/drivers/dri/intel/intel_context.c @@ -711,18 +711,18 @@ intelInitContext(struct intel_context *intel, intel->has_xrgb_textures = GL_TRUE; intel->gen = intelScreen->chipset.gen; - if (IS_GEN7(intel->intelScreen->deviceID)) { + if (intel->intelScreen->chipset.gen == 7) { intel->needs_ff_sync = GL_TRUE; intel->has_luminance_srgb = GL_TRUE; /* FINISHME: Enable intel->has_separate_stencil on Gen7. */ /* FINISHME: Enable intel->must_use_separate_stencil on Gen7. */ /* FINISHME: Enable intel->has_hiz on Gen7. */ - } else if (IS_GEN6(intel->intelScreen->deviceID)) { + } else if (intel->intelScreen->chipset.gen == 6) { intel->needs_ff_sync = GL_TRUE; intel->has_luminance_srgb = GL_TRUE; /* FINISHME: Enable intel->has_separate_stencil on Gen6. */ /* FINISHME: Enable intel->has_hiz on Gen6. */ - } else if (IS_GEN5(intel->intelScreen->deviceID)) { + } else if (intel->intelScreen->chipset.gen == 5) { intel->needs_ff_sync = GL_TRUE; intel->has_luminance_srgb = GL_TRUE; } else if (intel->intelScreen->chipset.gen == 4) {