- Ported vlinetallasm4 to AMD64 assembly. Even with the increased number of
registers AMD64 provides, this routine still needs to be written as self- modifying code for maximum performance. The additional registers do allow for further optimization over the x86 version by allowing all four pixels to be in flight at the same time. The end result is that AMD64 ASM is about 2.18 times faster than AMD64 C and about 1.06 times faster than x86 ASM. (For further comparison, AMD64 C and x86 C are practically the same for this function.) Should I port any more assembly to AMD64, mvlineasm4 is the most likely candidate, but it's not used enough at this point to bother. Also, this may or may not work with Linux at the moment, since it doesn't have the eh_handler metadata. Win64 is easier, since I just need to structure the function prologue and epilogue properly and use some assembler directives/macros to automatically generate the metadata. And that brings up another point: You need YASM to assemble the AMD64 code, because NASM doesn't support the Win64 metadata directives. - Added an SSE version of DoBlending. This is strictly C intrinsics. VC++ still throws around unneccessary register moves. GCC seems to be pretty close to optimal, requiring only about 2 cycles/color. They're both faster than my hand-written MMX routine, so I don't need to feel bad about not hand-optimizing this for x64 builds. - Removed an extra instruction from DoBlending_MMX, transposed two instructions, and unrolled it once, shaving off about 80 cycles from the time required to blend 256 palette entries. Why? Because I tried writing a C version of the routine using compiler intrinsics and was appalled by all the extra movq's VC++ added to the code. GCC was better, but still generated extra instructions. I only wanted a C version because I can't use inline assembly with VC++'s x64 compiler, and x64 assembly is a bit of a pain. (It's a pain because Linux and Windows have different calling conventions, and you need to maintain extra metadata for functions.) So, the assembly version stays and the C version stays out. - Removed all the pixel doubling r_detail modes, since the one platform they were intended to assist (486) actually sees very little benefit from them. - Rewrote CheckMMX in C and renamed it to CheckCPU. - Fixed: CPUID function 0x80000005 is specified to return detailed L1 cache only for AMD processors, so we must not use it on other architectures, or we end up overwriting the L1 cache line size with 0 or some other number we don't actually understand. SVN r1134 (trunk)
This commit is contained in:
Randy Heit
parent
14e94b86e2
commit
dda5ddd3c2
37 changed files with 1097 additions and 1276 deletions
119
src/r_main.cpp
119
src/r_main.cpp
|
|
@ -191,7 +191,7 @@ bool foggy; // [RH] ignore extralight and fullbright?
|
|||
int r_actualextralight;
|
||||
|
||||
bool setsizeneeded;
|
||||
int setblocks, setdetail = -1;
|
||||
int setblocks;
|
||||
|
||||
fixed_t freelookviewheight;
|
||||
|
||||
|
|
@ -516,8 +516,8 @@ void R_SetVisibility (float vis)
|
|||
else
|
||||
r_WallVisibility = r_BaseVisibility;
|
||||
|
||||
r_WallVisibility = FixedMul (Scale (InvZtoScale, SCREENWIDTH*(BaseRatioSizes[WidescreenRatio][1]<<detailyshift),
|
||||
(viewwidth<<detailxshift)*SCREENHEIGHT*3), FixedMul (r_WallVisibility, FocalTangent));
|
||||
r_WallVisibility = FixedMul (Scale (InvZtoScale, SCREENWIDTH*BaseRatioSizes[WidescreenRatio][1],
|
||||
viewwidth*SCREENHEIGHT*3), FixedMul (r_WallVisibility, FocalTangent));
|
||||
|
||||
// Prevent overflow on floors/ceilings. Note that the calculation of
|
||||
// MaxVisForFloor means that planes less than two units from the player's
|
||||
|
|
@ -562,48 +562,6 @@ void R_SetViewSize (int blocks)
|
|||
setblocks = blocks;
|
||||
}
|
||||
|
||||
//==========================================================================
|
||||
//
|
||||
// CVAR r_detail
|
||||
//
|
||||
// Selects a pixel doubling mode
|
||||
//
|
||||
//==========================================================================
|
||||
|
||||
CUSTOM_CVAR (Int, r_detail, 0, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
|
||||
{
|
||||
static bool badrecovery = false;
|
||||
|
||||
if (badrecovery)
|
||||
{
|
||||
badrecovery = false;
|
||||
return;
|
||||
}
|
||||
|
||||
if (self < 0 || self > 3)
|
||||
{
|
||||
Printf ("Bad detail mode. (Use 0-3)\n");
|
||||
badrecovery = true;
|
||||
self = (detailyshift << 1) | detailxshift;
|
||||
return;
|
||||
}
|
||||
|
||||
setdetail = self;
|
||||
setsizeneeded = true;
|
||||
}
|
||||
|
||||
//==========================================================================
|
||||
//
|
||||
// R_SetDetail
|
||||
//
|
||||
//==========================================================================
|
||||
|
||||
void R_SetDetail (int detail)
|
||||
{
|
||||
detailxshift = detail & 1;
|
||||
detailyshift = (detail >> 1) & 1;
|
||||
}
|
||||
|
||||
//==========================================================================
|
||||
//
|
||||
// R_SetWindow
|
||||
|
|
@ -616,19 +574,19 @@ void R_SetWindow (int windowSize, int fullWidth, int fullHeight, int stHeight)
|
|||
|
||||
if (windowSize >= 11)
|
||||
{
|
||||
realviewwidth = fullWidth;
|
||||
freelookviewheight = realviewheight = fullHeight;
|
||||
viewwidth = fullWidth;
|
||||
freelookviewheight = viewheight = fullHeight;
|
||||
}
|
||||
else if (windowSize == 10)
|
||||
{
|
||||
realviewwidth = fullWidth;
|
||||
realviewheight = stHeight;
|
||||
viewwidth = fullWidth;
|
||||
viewheight = stHeight;
|
||||
freelookviewheight = fullHeight;
|
||||
}
|
||||
else
|
||||
{
|
||||
realviewwidth = ((setblocks*fullWidth)/10) & (~15);
|
||||
realviewheight = ((setblocks*stHeight)/10)&~7;
|
||||
viewwidth = ((setblocks*fullWidth)/10) & (~15);
|
||||
viewheight = ((setblocks*stHeight)/10)&~7;
|
||||
freelookviewheight = ((setblocks*fullHeight)/10)&~7;
|
||||
}
|
||||
|
||||
|
|
@ -637,10 +595,7 @@ void R_SetWindow (int windowSize, int fullWidth, int fullHeight, int stHeight)
|
|||
|
||||
DrawFSHUD = (windowSize == 11);
|
||||
|
||||
viewwidth = realviewwidth >> detailxshift;
|
||||
viewheight = realviewheight >> detailyshift;
|
||||
fuzzviewheight = viewheight - 2; // Maximum row the fuzzer can draw to
|
||||
freelookviewheight >>= detailyshift;
|
||||
halfviewwidth = (viewwidth >> 1) - 1;
|
||||
|
||||
if (!bRenderingToCanvas)
|
||||
|
|
@ -659,8 +614,8 @@ void R_SetWindow (int windowSize, int fullWidth, int fullHeight, int stHeight)
|
|||
centerxfrac = centerx<<FRACBITS;
|
||||
centeryfrac = centery<<FRACBITS;
|
||||
|
||||
virtwidth = fullWidth >> detailxshift;
|
||||
virtheight = fullHeight >> detailyshift;
|
||||
virtwidth = fullWidth;
|
||||
virtheight = fullHeight;
|
||||
if (WidescreenRatio & 4)
|
||||
{
|
||||
virtheight = virtheight * BaseRatioSizes[WidescreenRatio][3] / 48;
|
||||
|
|
@ -692,8 +647,8 @@ void R_SetWindow (int windowSize, int fullWidth, int fullHeight, int stHeight)
|
|||
|
||||
R_InitTextureMapping ();
|
||||
|
||||
MaxVisForWall = FixedMul (Scale (InvZtoScale, SCREENWIDTH*(r_Yaspect<<detailyshift),
|
||||
(viewwidth<<detailxshift)*SCREENHEIGHT), FocalTangent);
|
||||
MaxVisForWall = FixedMul (Scale (InvZtoScale, SCREENWIDTH*r_Yaspect,
|
||||
viewwidth*SCREENHEIGHT), FocalTangent);
|
||||
MaxVisForWall = FixedDiv (0x7fff0000, MaxVisForWall);
|
||||
MaxVisForFloor = Scale (FixedDiv (0x7fff0000, viewheight<<(FRACBITS-2)), FocalLengthY, 160*FRACUNIT);
|
||||
|
||||
|
|
@ -712,20 +667,13 @@ void R_ExecuteSetViewSize ()
|
|||
setsizeneeded = false;
|
||||
BorderNeedRefresh = screen->GetPageCount ();
|
||||
|
||||
if (setdetail >= 0)
|
||||
{
|
||||
R_SetDetail (setdetail);
|
||||
setdetail = -1;
|
||||
}
|
||||
|
||||
R_SetWindow (setblocks, SCREENWIDTH, SCREENHEIGHT, ST_Y);
|
||||
|
||||
// Handle resize, e.g. smaller view windows with border and/or status bar.
|
||||
viewwindowx = (screen->GetWidth() - (viewwidth<<detailxshift))>>1;
|
||||
viewwindowx = (screen->GetWidth() - viewwidth) >> 1;
|
||||
|
||||
// Same with base row offset.
|
||||
viewwindowy = ((viewwidth<<detailxshift) == screen->GetWidth()) ?
|
||||
0 : (ST_Y-(viewheight<<detailyshift)) >> 1;
|
||||
viewwindowy = (viewwidth == screen->GetWidth()) ? 0 : (ST_Y - viewheight) >> 1;
|
||||
}
|
||||
|
||||
//==========================================================================
|
||||
|
|
@ -762,7 +710,7 @@ CUSTOM_CVAR (Int, r_columnmethod, 1, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
|
|||
}
|
||||
else
|
||||
{ // Trigger the change
|
||||
r_detail.Callback ();
|
||||
setsizeneeded = true;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1434,29 +1382,20 @@ void R_EnterMirror (drawseg_t *ds, int depth)
|
|||
//
|
||||
//==========================================================================
|
||||
|
||||
void R_SetupBuffer (bool inview)
|
||||
void R_SetupBuffer ()
|
||||
{
|
||||
static BYTE *lastbuff = NULL;
|
||||
|
||||
int pitch = RenderTarget->GetPitch();
|
||||
BYTE *lineptr = RenderTarget->GetBuffer() + viewwindowy*pitch + viewwindowx;
|
||||
|
||||
if (inview)
|
||||
{
|
||||
pitch <<= detailyshift;
|
||||
}
|
||||
if (detailxshift)
|
||||
{
|
||||
lineptr += viewwidth;
|
||||
}
|
||||
|
||||
if (dc_pitch != pitch || lineptr != lastbuff)
|
||||
{
|
||||
if (dc_pitch != pitch)
|
||||
{
|
||||
dc_pitch = pitch;
|
||||
R_InitFuzzTable (pitch);
|
||||
#ifdef USEASM
|
||||
#if defined(X86_ASM) || defined(X64_ASM)
|
||||
ASM_PatchPitch ();
|
||||
#endif
|
||||
}
|
||||
|
|
@ -1478,7 +1417,7 @@ void R_RenderActorView (AActor *actor, bool dontmaplines)
|
|||
{
|
||||
WallCycles = PlaneCycles = MaskedCycles = WallScanCycles = 0;
|
||||
|
||||
R_SetupBuffer (true);
|
||||
R_SetupBuffer ();
|
||||
R_SetupFrame (actor);
|
||||
|
||||
// Clear buffers.
|
||||
|
|
@ -1569,17 +1508,8 @@ void R_RenderActorView (AActor *actor, bool dontmaplines)
|
|||
}
|
||||
}
|
||||
WallMirrors.Clear ();
|
||||
|
||||
interpolator.RestoreInterpolations ();
|
||||
|
||||
// If there is vertical doubling, and the view window is not an even height,
|
||||
// draw a black line at the bottom of the view window.
|
||||
if (detailyshift && viewwindowy == 0 && (realviewheight & 1))
|
||||
{
|
||||
screen->Clear (0, realviewheight-1, realviewwidth, realviewheight, 0, 0);
|
||||
}
|
||||
|
||||
R_SetupBuffer (false);
|
||||
R_SetupBuffer ();
|
||||
}
|
||||
|
||||
//==========================================================================
|
||||
|
|
@ -1593,16 +1523,12 @@ void R_RenderActorView (AActor *actor, bool dontmaplines)
|
|||
void R_RenderViewToCanvas (AActor *actor, DCanvas *canvas,
|
||||
int x, int y, int width, int height, bool dontmaplines)
|
||||
{
|
||||
const int saveddetail = detailxshift | (detailyshift << 1);
|
||||
const bool savedviewactive = viewactive;
|
||||
|
||||
detailxshift = detailyshift = 0;
|
||||
realviewwidth = viewwidth = width;
|
||||
|
||||
viewwidth = width;
|
||||
RenderTarget = canvas;
|
||||
bRenderingToCanvas = true;
|
||||
|
||||
R_SetDetail (0);
|
||||
R_SetWindow (12, width, height, height);
|
||||
viewwindowx = x;
|
||||
viewwindowy = y;
|
||||
|
|
@ -1612,10 +1538,9 @@ void R_RenderViewToCanvas (AActor *actor, DCanvas *canvas,
|
|||
|
||||
RenderTarget = screen;
|
||||
bRenderingToCanvas = false;
|
||||
R_SetDetail (saveddetail);
|
||||
R_ExecuteSetViewSize ();
|
||||
screen->Lock (true);
|
||||
R_SetupBuffer (false);
|
||||
R_SetupBuffer ();
|
||||
screen->Unlock ();
|
||||
viewactive = savedviewactive;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue