qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-12-02 00:52:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Nuke UNALIGNED_OK.

Browse source 
It's not really necessary (and was effectively dead anyway).
This commit is contained in:
Bill Currie 2012-06-02 20:32:36 +09:00
parent 8dc1961e8c
commit b2290d92c9
3 changed files with 1 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/qw/bothdefs.h
View file

@ -28,16 +28,8 @@
#ifndef _BOTHDEFS_H #ifndef _BOTHDEFS_H
#define _BOTHDEFS_H #define _BOTHDEFS_H
#ifdef USE_INTEL_ASM
# define UNALIGNED_OK 1 // set to 0 if unaligned accesses are not supported
#else
# define UNALIGNED_OK 0
#endif
#define UNUSED(x) (x = x) // for pesky compiler / lint warnings #define MINIMUM_MEMORY 0x400000 // Error out if we get less than 4MB
// Error out if we get less than 4MB
#define MINIMUM_MEMORY 0x400000

16
libs/video/renderer/sw/sw_rsky.c
View file

@ -110,21 +110,6 @@ R_MakeSky (void)
for (y = 0; y < SKYSIZE; y++) { for (y = 0; y < SKYSIZE; y++) {
baseofs = ((y + yshift) & SKYMASK) * 131; baseofs = ((y + yshift) & SKYMASK) * 131;
// FIXME: clean this up
#if UNALIGNED_OK
for (x = 0; x < SKYSIZE; x += 4) {
ofs = baseofs + ((x + xshift) & SKYMASK);
// PORT: unaligned dword access to bottommask and bottomsky
*pnewsky = (*(pnewsky + (128 / sizeof (unsigned int))) &
*(unsigned int *) &bottommask[ofs]) |
*(unsigned int *) &bottomsky[ofs];
pnewsky++;
}
#else
for (x = 0; x < SKYSIZE; x++) { for (x = 0; x < SKYSIZE; x++) {
ofs = baseofs + ((x + xshift) & SKYMASK); ofs = baseofs + ((x + xshift) & SKYMASK);
@ -133,7 +118,6 @@ R_MakeSky (void)
*(byte *) & bottomsky[ofs]; *(byte *) & bottomsky[ofs];
pnewsky = (unsigned int *) ((byte *) pnewsky + 1); pnewsky = (unsigned int *) ((byte *) pnewsky + 1);
} }
#endif
pnewsky += 128 / sizeof (unsigned int); pnewsky += 128 / sizeof (unsigned int);
} }

6
nq/include/game.h
View file

@ -49,12 +49,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <setjmp.h> #include <setjmp.h>
#ifdef USE_INTEL_ASM
#define UNALIGNED_OK 1 // set to 0 if unaligned accesses are not supported
#else
#define UNALIGNED_OK 0
#endif
#define MINIMUM_MEMORY 0x550000 #define MINIMUM_MEMORY 0x550000
#define MINIMUM_MEMORY_LEVELPAK (MINIMUM_MEMORY + 0x100000) #define MINIMUM_MEMORY_LEVELPAK (MINIMUM_MEMORY + 0x100000)