[quake3-commits] r1843 - in trunk/code: qcommon renderer
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Fri Feb 4 08:43:41 EST 2011
Author: thilo
Date: 2011-02-04 08:43:41 -0500 (Fri, 04 Feb 2011)
New Revision: 1843
Modified:
trunk/code/qcommon/q_shared.h
trunk/code/renderer/tr_local.h
trunk/code/renderer/tr_surface.c
Log:
https://bugzilla.icculus.org/show_bug.cgi?id=4460
Modified: trunk/code/qcommon/q_shared.h
===================================================================
--- trunk/code/qcommon/q_shared.h 2011-02-04 13:25:51 UTC (rev 1842)
+++ trunk/code/qcommon/q_shared.h 2011-02-04 13:43:41 UTC (rev 1843)
@@ -181,9 +181,9 @@
#define PAD(x,y) (((x)+(y)-1) & ~((y)-1))
#ifdef __GNUC__
-#define ALIGN(x) __attribute__((aligned(x)))
+#define QALIGN(x) __attribute__((aligned(x)))
#else
-#define ALIGN(x)
+#define QALIGN(x)
#endif
#ifndef NULL
Modified: trunk/code/renderer/tr_local.h
===================================================================
--- trunk/code/renderer/tr_local.h 2011-02-04 13:25:51 UTC (rev 1842)
+++ trunk/code/renderer/tr_local.h 2011-02-04 13:43:41 UTC (rev 1843)
@@ -1303,19 +1303,19 @@
typedef struct shaderCommands_s
{
- 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);
+ glIndex_t indexes[SHADER_MAX_INDEXES] QALIGN(16);
+ vec4_t xyz[SHADER_MAX_VERTEXES] QALIGN(16);
+ vec4_t normal[SHADER_MAX_VERTEXES] QALIGN(16);
+ vec2_t texCoords[SHADER_MAX_VERTEXES][2] QALIGN(16);
+ color4ub_t vertexColors[SHADER_MAX_VERTEXES] QALIGN(16);
+ int vertexDlightBits[SHADER_MAX_VERTEXES] QALIGN(16);
- stageVars_t svars ALIGN(16);
+ stageVars_t svars QALIGN(16);
- color4ub_t constantColor255[SHADER_MAX_VERTEXES] ALIGN(16);
+ color4ub_t constantColor255[SHADER_MAX_VERTEXES] QALIGN(16);
shader_t *shader;
- float shaderTime;
+ float shaderTime;
int fogNum;
int dlightBits; // or together of all vertexDlightBits
Modified: trunk/code/renderer/tr_surface.c
===================================================================
--- trunk/code/renderer/tr_surface.c 2011-02-04 13:25:51 UTC (rev 1842)
+++ trunk/code/renderer/tr_surface.c 2011-02-04 13:43:41 UTC (rev 1843)
@@ -615,10 +615,10 @@
{
short *oldXyz, *newXyz, *oldNormals, *newNormals;
float *outXyz, *outNormal;
- float oldXyzScale ALIGN(16);
- float newXyzScale ALIGN(16);
- float oldNormalScale ALIGN(16);
- float newNormalScale ALIGN(16);
+ float oldXyzScale QALIGN(16);
+ float newXyzScale QALIGN(16);
+ float oldNormalScale QALIGN(16);
+ float newNormalScale QALIGN(16);
int vertNum;
unsigned lat, lng;
int numVerts;
More information about the quake3-commits
mailing list