teambeef/ioq3quest
0
0
Fork 0
mirror of https://github.com/DrBeef/ioq3quest.git synced 2024-11-12 23:54:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Replaced ALIGN macro with PAD

Browse source 
* Moved ALIGN16 macro from tr_local.h to ALIGN in q_shared.h
This commit is contained in:
Tim Angus 2005-12-05 17:32:54 +00:00
parent cfdd586ef8
commit 1704eecc52
6 changed files with 25 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
code/botlib/be_aas_route.c
View file

@ -521,7 +521,8 @@ void AAS_CalculateAreaTravelTimes(void)
// //
size += settings->numreachableareas * sizeof(unsigned short *); size += settings->numreachableareas * sizeof(unsigned short *);
// //
size += settings->numreachableareas * ALIGN(revreach->numlinks) * sizeof(unsigned short); size += settings->numreachableareas *
PAD(revreach->numlinks, sizeof(long)) * sizeof(unsigned short);
} //end for } //end for
//allocate memory for the area travel times //allocate memory for the area travel times
ptr = (char *) GetClearedMemory(size); ptr = (char *) GetClearedMemory(size);
@ -541,7 +542,7 @@ void AAS_CalculateAreaTravelTimes(void)
for (l = 0; l < settings->numreachableareas; l++) for (l = 0; l < settings->numreachableareas; l++)
{ {
aasworld.areatraveltimes[i][l] = (unsigned short *) ptr; aasworld.areatraveltimes[i][l] = (unsigned short *) ptr;
ptr += ALIGN(revreach->numlinks) * sizeof(unsigned short); ptr += PAD(revreach->numlinks, sizeof(long)) * sizeof(unsigned short);
//reachability link //reachability link
reach = &aasworld.reachability[settings->firstreachablearea + l]; reach = &aasworld.reachability[settings->firstreachablearea + l];
// //

8
code/botlib/be_ai_chat.c
View file

@ -690,7 +690,7 @@ bot_synonymlist_t *BotLoadSynonyms(char *filename)
return NULL; return NULL;
} //end if } //end if
len = strlen(token.string) + 1; len = strlen(token.string) + 1;
len = ALIGN(len); len = PAD(len, sizeof(long));
size += sizeof(bot_synonym_t) + len; size += sizeof(bot_synonym_t) + len;
if (pass) if (pass)
{ {
@ -989,7 +989,7 @@ bot_randomlist_t *BotLoadRandomStrings(char *filename)
return NULL; return NULL;
} //end if } //end if
len = strlen(token.string) + 1; len = strlen(token.string) + 1;
len = ALIGN(len); len = PAD(len, sizeof(long));
size += sizeof(bot_randomlist_t) + len; size += sizeof(bot_randomlist_t) + len;
if (pass) if (pass)
{ {
@ -1020,7 +1020,7 @@ bot_randomlist_t *BotLoadRandomStrings(char *filename)
return NULL; return NULL;
} //end if } //end if
len = strlen(chatmessagestring) + 1; len = strlen(chatmessagestring) + 1;
len = ALIGN(len); len = PAD(len, sizeof(long));
size += sizeof(bot_randomstring_t) + len; size += sizeof(bot_randomstring_t) + len;
if (pass) if (pass)
{ {
@ -2123,7 +2123,7 @@ bot_chat_t *BotLoadInitialChat(char *chatfile, char *chatname)
return NULL; return NULL;
} //end if } //end if
len = strlen(chatmessagestring) + 1; len = strlen(chatmessagestring) + 1;
len = ALIGN(len); len = PAD(len, sizeof(long));
if (pass) if (pass)
{ {
chatmessage = (bot_chatmessage_t *) ptr; chatmessage = (bot_chatmessage_t *) ptr;

2
code/client/snd_codec_wav.c
View file

@ -91,7 +91,7 @@ static int S_FindRIFFChunk( fileHandle_t f, char *chunk ) {
if( !Q_strncmp( name, chunk, 4 ) ) if( !Q_strncmp( name, chunk, 4 ) )
return len; return len;
len = (len + 1 ) & ~1; // pad to word boundary len = PAD( len, 2 );
// Not the right chunk - skip it // Not the right chunk - skip it
FS_Seek( f, len, FS_SEEK_CUR ); FS_Seek( f, len, FS_SEEK_CUR );

4
code/qcommon/common.c
View file

@ -929,7 +929,7 @@ void *Z_TagMalloc( int size, int tag ) {
// //
size += sizeof(memblock_t); // account for size of block header size += sizeof(memblock_t); // account for size of block header
size += 4; // space for memory trash tester size += 4; // space for memory trash tester
size = ALIGN(size); // align to 32/64 bit boundary size = PAD(size, sizeof(long)); // align to 32/64 bit boundary
base = rover = zone->rover; base = rover = zone->rover;
start = base->prev; start = base->prev;
@ -1746,7 +1746,7 @@ void *Hunk_AllocateTempMemory( int size ) {
Hunk_SwapBanks(); Hunk_SwapBanks();
size = ALIGN(size) + sizeof( hunkHeader_t ); size = PAD(size, sizeof(long)) + sizeof( hunkHeader_t );
if ( hunk_temp->temp + hunk_permanent->permanent + size > s_hunkTotal ) { if ( hunk_temp->temp + hunk_permanent->permanent + size > s_hunkTotal ) {
Com_Error( ERR_DROP, "Hunk_AllocateTempMemory: failed on %i", size ); Com_Error( ERR_DROP, "Hunk_AllocateTempMemory: failed on %i", size );

8
code/qcommon/q_shared.h
View file

@ -111,7 +111,13 @@ typedef int sfxHandle_t;
typedef int fileHandle_t; typedef int fileHandle_t;
typedef int clipHandle_t; typedef int clipHandle_t;
#define ALIGN(x) ((x+sizeof(long)-1) & ~(sizeof(long)-1)) #define PAD(x,y) (((x)+(y)-1) & ~((y)-1))
#ifdef __GNUC__
#define ALIGN(x) __attribute__((aligned(x)))
#else
#define ALIGN(x)
#endif
#ifndef NULL #ifndef NULL
#define NULL ((void *)0) #define NULL ((void *)0)

22
code/renderer/tr_local.h
View file

@ -1274,24 +1274,18 @@ typedef struct stageVars
} stageVars_t; } stageVars_t;
#ifdef __GNUC__
#define ALIGN16 __attribute__((aligned(16)))
#else
#define ALIGN16
#endif
typedef struct shaderCommands_s typedef struct shaderCommands_s
{ {
glIndex_t indexes[SHADER_MAX_INDEXES] ALIGN16; glIndex_t indexes[SHADER_MAX_INDEXES] ALIGN(16);
vec4_t xyz[SHADER_MAX_VERTEXES] ALIGN16; vec4_t xyz[SHADER_MAX_VERTEXES] ALIGN(16);
vec4_t normal[SHADER_MAX_VERTEXES] ALIGN16; vec4_t normal[SHADER_MAX_VERTEXES] ALIGN(16);
vec2_t texCoords[SHADER_MAX_VERTEXES][2] ALIGN16; vec2_t texCoords[SHADER_MAX_VERTEXES][2] ALIGN(16);
color4ub_t vertexColors[SHADER_MAX_VERTEXES] ALIGN16; color4ub_t vertexColors[SHADER_MAX_VERTEXES] ALIGN(16);
int vertexDlightBits[SHADER_MAX_VERTEXES] ALIGN16; 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; shader_t *shader;
float shaderTime; float shaderTime;