From patchwork Mon Feb 4 15:28:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lespiau, Damien" X-Patchwork-Id: 2093731 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id 1048EDFE82 for ; Mon, 4 Feb 2013 16:09:36 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F15ACE6210 for ; Mon, 4 Feb 2013 08:09:35 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 9AAFEE60F8 for ; Mon, 4 Feb 2013 07:30:26 -0800 (PST) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP; 04 Feb 2013 07:30:26 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.84,600,1355126400"; d="scan'208";a="257442484" Received: from unknown (HELO dyon.amr.corp.intel.com) ([10.255.12.132]) by orsmga001.jf.intel.com with ESMTP; 04 Feb 2013 07:30:25 -0800 From: Damien Lespiau To: intel-gfx@lists.freedesktop.org Date: Mon, 4 Feb 2013 15:28:15 +0000 Message-Id: <1359991705-5254-81-git-send-email-damien.lespiau@intel.com> X-Mailer: git-send-email 1.7.7.5 In-Reply-To: <1359991705-5254-1-git-send-email-damien.lespiau@intel.com> References: <1359991705-5254-1-git-send-email-damien.lespiau@intel.com> Subject: [Intel-gfx] [PATCH 80/90] assembler: Don't pollute the library files with gen4asm.h X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 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 gen4asm.h is assembler specific while we want the library files to be somewhat of a proper library. This means that we have to redefine the GL* typedefs for brw_structs.h, not using any of thet GL typedef will be for a future commit. Signed-off-by: Damien Lespiau --- assembler/brw_disasm.c | 1 - assembler/brw_eu.c | 1 - assembler/brw_eu.h | 1 - assembler/brw_structs.h | 8 ++++++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/assembler/brw_disasm.c b/assembler/brw_disasm.c index 8eaeb78..8524d41 100644 --- a/assembler/brw_disasm.c +++ b/assembler/brw_disasm.c @@ -27,7 +27,6 @@ #include #include -#include "gen4asm.h" #include "brw_eu.h" const struct opcode_desc opcode_descs[128] = { diff --git a/assembler/brw_eu.c b/assembler/brw_eu.c index 1641c95..69f088d 100644 --- a/assembler/brw_eu.c +++ b/assembler/brw_eu.c @@ -32,7 +32,6 @@ #include -#include "gen4asm.h" #include "brw_context.h" #include "brw_defines.h" #include "brw_eu.h" diff --git a/assembler/brw_eu.h b/assembler/brw_eu.h index 20d4b82..5d623c0 100644 --- a/assembler/brw_eu.h +++ b/assembler/brw_eu.h @@ -35,7 +35,6 @@ #include #include -#include "gen4asm.h" #include "brw_context.h" #include "brw_structs.h" #include "brw_defines.h" diff --git a/assembler/brw_structs.h b/assembler/brw_structs.h index e650bf5..2f6aafb 100644 --- a/assembler/brw_structs.h +++ b/assembler/brw_structs.h @@ -33,6 +33,14 @@ #ifndef BRW_STRUCTS_H #define BRW_STRUCTS_H +#include + +typedef unsigned char GLubyte; +typedef short GLshort; +typedef unsigned int GLuint; +typedef int GLint; +typedef float GLfloat; + /* These seem to be passed around as function args, so it works out * better to keep them as #defines: */