From 1fa5872b59f24cb05e82c4124ddb455834dd9f37 Mon Sep 17 00:00:00 2001 From: tma Date: Mon, 5 Dec 2005 17:32:54 +0000 Subject: * Replaced ALIGN macro with PAD * Moved ALIGN16 macro from tr_local.h to ALIGN in q_shared.h git-svn-id: svn://svn.icculus.org/quake3/trunk@417 edf5b092-35ff-0310-97b2-ce42778d08ea --- code/renderer/tr_local.h | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) (limited to 'code/renderer') diff --git a/code/renderer/tr_local.h b/code/renderer/tr_local.h index 646cc6f..865128f 100644 --- a/code/renderer/tr_local.h +++ b/code/renderer/tr_local.h @@ -1274,24 +1274,18 @@ typedef struct stageVars } stageVars_t; -#ifdef __GNUC__ -#define ALIGN16 __attribute__((aligned(16))) -#else -#define ALIGN16 -#endif - typedef struct shaderCommands_s { - glIndex_t indexes[SHADER_MAX_INDEXES] ALIGN16; - vec4_t xyz[SHADER_MAX_VERTEXES] ALIGN16; - vec4_t normal[SHADER_MAX_VERTEXES] ALIGN16; - vec2_t texCoords[SHADER_MAX_VERTEXES][2] ALIGN16; - color4ub_t vertexColors[SHADER_MAX_VERTEXES] ALIGN16; - int vertexDlightBits[SHADER_MAX_VERTEXES] ALIGN16; + glIndex_t indexes[SHADER_MAX_INDEXES] ALIGN(16); + vec4_t xyz[SHADER_MAX_VERTEXES] ALIGN(16); + vec4_t normal[SHADER_MAX_VERTEXES] ALIGN(16); + vec2_t texCoords[SHADER_MAX_VERTEXES][2] ALIGN(16); + color4ub_t vertexColors[SHADER_MAX_VERTEXES] ALIGN(16); + int vertexDlightBits[SHADER_MAX_VERTEXES] ALIGN(16); - stageVars_t svars ALIGN16; + stageVars_t svars ALIGN(16); - color4ub_t constantColor255[SHADER_MAX_VERTEXES] ALIGN16; + color4ub_t constantColor255[SHADER_MAX_VERTEXES] ALIGN(16); shader_t *shader; float shaderTime; -- cgit v1.2.3