ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GPU: If a custom-sized layer is to be rendered first, GPUEngineBase::_TransitionLineNativeToCustom() will do a line clear instead of an upscaled line copy. 

- Since this is a very common occurrence in many games, and since doing a clear is faster than doing an upscaled copy, this should give a small performance improvement for the larger framebuffer sizes.
This commit is contained in:
rogerman 2018-02-13 13:54:10 -08:00
parent 43d3883986
commit 5fbaa53b46
2 changed files with 57 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
desmume/src/GPU.cpp
View File

@ -782,9 +782,12 @@ void GPUEngineBase::_Reset_Base()
GPUEngineRenderState &renderState = this->_currentRenderState; GPUEngineRenderState &renderState = this->_currentRenderState;
renderState.displayOutputMode = GPUDisplayMode_Off; renderState.displayOutputMode = GPUDisplayMode_Off;
renderState.previouslyRenderedLayerID = GPULayerID_Backdrop;
renderState.selectedLayerID = GPULayerID_BG0; renderState.selectedLayerID = GPULayerID_BG0;
renderState.selectedBGLayer = &this->_BGLayer[GPULayerID_BG0]; renderState.selectedBGLayer = &this->_BGLayer[GPULayerID_BG0];
renderState.backdropColor16 = LE_TO_LOCAL_16(this->_paletteBG[0]) & 0x7FFF; renderState.backdropColor16 = LE_TO_LOCAL_16(this->_paletteBG[0]) & 0x7FFF;
renderState.workingBackdropColor16 = renderState.backdropColor16;
renderState.workingBackdropColor32.color = (dispInfo.colorFormat == NDSColorFormat_BGR666_Rev) ? COLOR555TO666(LOCAL_TO_LE_16(renderState.workingBackdropColor16)) : COLOR555TO888(LOCAL_TO_LE_16(renderState.workingBackdropColor16));
renderState.colorEffect = (ColorEffect)this->_IORegisterMap->BLDCNT.ColorEffect; renderState.colorEffect = (ColorEffect)this->_IORegisterMap->BLDCNT.ColorEffect;
renderState.blendEVA = 0; renderState.blendEVA = 0;
renderState.blendEVB = 0; renderState.blendEVB = 0;
@ -1603,32 +1606,32 @@ template <NDSColorFormat OUTPUTFORMAT>
void GPUEngineBase::_RenderLine_Clear(GPUEngineCompositorInfo &compInfo) void GPUEngineBase::_RenderLine_Clear(GPUEngineCompositorInfo &compInfo)
{ {
// Clear the current line with the clear color // Clear the current line with the clear color
u16 dstClearColor16 = compInfo.renderState.backdropColor16;
if (compInfo.renderState.srcEffectEnable[GPULayerID_Backdrop]) if (compInfo.renderState.srcEffectEnable[GPULayerID_Backdrop])
{ {
if (compInfo.renderState.colorEffect == ColorEffect_IncreaseBrightness) if (compInfo.renderState.colorEffect == ColorEffect_IncreaseBrightness)
{ {
dstClearColor16 = compInfo.renderState.brightnessUpTable555[compInfo.renderState.backdropColor16]; compInfo.renderState.workingBackdropColor16 = compInfo.renderState.brightnessUpTable555[compInfo.renderState.backdropColor16];
} }
else if (compInfo.renderState.colorEffect == ColorEffect_DecreaseBrightness) else if (compInfo.renderState.colorEffect == ColorEffect_DecreaseBrightness)
{ {
dstClearColor16 = compInfo.renderState.brightnessDownTable555[compInfo.renderState.backdropColor16]; compInfo.renderState.workingBackdropColor16 = compInfo.renderState.brightnessDownTable555[compInfo.renderState.backdropColor16];
} }
} }
switch (OUTPUTFORMAT) switch (OUTPUTFORMAT)
{ {
case NDSColorFormat_BGR555_Rev: case NDSColorFormat_BGR555_Rev:
memset_u16_fast<GPU_FRAMEBUFFER_NATIVE_WIDTH>(*compInfo.target.lineColor, dstClearColor16); memset_u16_fast<GPU_FRAMEBUFFER_NATIVE_WIDTH>(*compInfo.target.lineColor, compInfo.renderState.workingBackdropColor16);
break; break;
case NDSColorFormat_BGR666_Rev: case NDSColorFormat_BGR666_Rev:
memset_u32_fast<GPU_FRAMEBUFFER_NATIVE_WIDTH>(*compInfo.target.lineColor, COLOR555TO666(LOCAL_TO_LE_16(dstClearColor16))); compInfo.renderState.workingBackdropColor32.color = COLOR555TO666(LOCAL_TO_LE_16(compInfo.renderState.workingBackdropColor16));
memset_u32_fast<GPU_FRAMEBUFFER_NATIVE_WIDTH>(*compInfo.target.lineColor, compInfo.renderState.workingBackdropColor32.color);
break; break;
case NDSColorFormat_BGR888_Rev: case NDSColorFormat_BGR888_Rev:
memset_u32_fast<GPU_FRAMEBUFFER_NATIVE_WIDTH>(*compInfo.target.lineColor, COLOR555TO888(LOCAL_TO_LE_16(dstClearColor16))); compInfo.renderState.workingBackdropColor32.color = COLOR555TO888(LOCAL_TO_LE_16(compInfo.renderState.workingBackdropColor16));
memset_u32_fast<GPU_FRAMEBUFFER_NATIVE_WIDTH>(*compInfo.target.lineColor, compInfo.renderState.workingBackdropColor32.color);
break; break;
} }
@ -1643,11 +1646,14 @@ void GPUEngineBase::_RenderLine_Clear(GPUEngineCompositorInfo &compInfo)
this->_itemsForPriority[3].nbPixelsX = 0; this->_itemsForPriority[3].nbPixelsX = 0;
} }
template <NDSColorFormat OUTPUTFORMAT>
void GPUEngineBase::UpdateRenderStates(const size_t l) void GPUEngineBase::UpdateRenderStates(const size_t l)
{ {
GPUEngineCompositorInfo &compInfo = this->_currentCompositorInfo[l]; GPUEngineCompositorInfo &compInfo = this->_currentCompositorInfo[l];
this->_currentRenderState.backdropColor16 = LE_TO_LOCAL_16(this->_paletteBG[0]) & 0x7FFF; this->_currentRenderState.backdropColor16 = LE_TO_LOCAL_16(this->_paletteBG[0]) & 0x7FFF;
this->_currentRenderState.workingBackdropColor16 = this->_currentRenderState.backdropColor16;
this->_currentRenderState.workingBackdropColor32.color = (OUTPUTFORMAT == NDSColorFormat_BGR666_Rev) ? COLOR555TO666(LOCAL_TO_LE_16(this->_currentRenderState.workingBackdropColor16)) : COLOR555TO888(LOCAL_TO_LE_16(this->_currentRenderState.workingBackdropColor16));
compInfo.renderState = this->_currentRenderState; compInfo.renderState = this->_currentRenderState;
} }
@ -1841,6 +1847,24 @@ template <NDSColorFormat OUTPUTFORMAT>
void GPUEngineBase::_TransitionLineNativeToCustom(GPUEngineCompositorInfo &compInfo) void GPUEngineBase::_TransitionLineNativeToCustom(GPUEngineCompositorInfo &compInfo)
{ {
if (this->isLineRenderNative[compInfo.line.indexNative]) if (this->isLineRenderNative[compInfo.line.indexNative])
{
if (compInfo.renderState.previouslyRenderedLayerID == GPULayerID_Backdrop)
{
switch (OUTPUTFORMAT)
{
case NDSColorFormat_BGR555_Rev:
memset_u16(compInfo.target.lineColorHeadCustom, compInfo.renderState.workingBackdropColor16, compInfo.line.pixelCount);
break;
case NDSColorFormat_BGR666_Rev:
case NDSColorFormat_BGR888_Rev:
memset_u32(compInfo.target.lineColorHeadCustom, compInfo.renderState.workingBackdropColor32.color, compInfo.line.pixelCount);
break;
}
memset(compInfo.target.lineLayerIDHeadCustom, GPULayerID_Backdrop, compInfo.line.pixelCount);
}
else
{ {
switch (OUTPUTFORMAT) switch (OUTPUTFORMAT)
{ {
@ -1855,6 +1879,7 @@ void GPUEngineBase::_TransitionLineNativeToCustom(GPUEngineCompositorInfo &compI
} }
this->_LineCopy<0xFFFF, false, false, 1>(compInfo.target.lineLayerIDHeadCustom, compInfo.target.lineLayerIDHeadNative, 0); this->_LineCopy<0xFFFF, false, false, 1>(compInfo.target.lineLayerIDHeadCustom, compInfo.target.lineLayerIDHeadNative, 0);
}
compInfo.target.lineColorHead = compInfo.target.lineColorHeadCustom; compInfo.target.lineColorHead = compInfo.target.lineColorHeadCustom;
compInfo.target.lineLayerIDHead = compInfo.target.lineLayerIDHeadCustom; compInfo.target.lineLayerIDHead = compInfo.target.lineLayerIDHeadCustom;
@ -3939,6 +3964,7 @@ void GPUEngineBase::SpriteRenderDebug(const u16 lineIndex, u16 *dst)
memset(&compInfo, 0, sizeof(compInfo)); memset(&compInfo, 0, sizeof(compInfo));
compInfo.renderState.displayOutputMode = GPUDisplayMode_Normal; compInfo.renderState.displayOutputMode = GPUDisplayMode_Normal;
compInfo.renderState.previouslyRenderedLayerID = GPULayerID_Backdrop;
compInfo.renderState.selectedLayerID = GPULayerID_OBJ; compInfo.renderState.selectedLayerID = GPULayerID_OBJ;
compInfo.renderState.colorEffect = ColorEffect_Disable; compInfo.renderState.colorEffect = ColorEffect_Disable;
compInfo.renderState.masterBrightnessMode = GPUMasterBrightMode_Disable; compInfo.renderState.masterBrightnessMode = GPUMasterBrightMode_Disable;
@ -4263,6 +4289,8 @@ void GPUEngineBase::_RenderLine_Layers(const size_t l)
compInfo.target.lineColor32 = (FragmentColor *)compInfo.target.lineColorHeadNative; compInfo.target.lineColor32 = (FragmentColor *)compInfo.target.lineColorHeadNative;
compInfo.target.lineLayerID = compInfo.target.lineLayerIDHead; compInfo.target.lineLayerID = compInfo.target.lineLayerIDHead;
compInfo.renderState.previouslyRenderedLayerID = GPULayerID_Backdrop;
this->_RenderLine_Clear<OUTPUTFORMAT>(compInfo); this->_RenderLine_Clear<OUTPUTFORMAT>(compInfo);
// for all the pixels in the line // for all the pixels in the line
@ -4344,6 +4372,8 @@ void GPUEngineBase::_RenderLine_Layers(const size_t l)
{ {
this->_RenderLine_LayerBG<GPUCompositorMode_Unknown, OUTPUTFORMAT, WILLPERFORMWINDOWTEST>(compInfo); this->_RenderLine_LayerBG<GPUCompositorMode_Unknown, OUTPUTFORMAT, WILLPERFORMWINDOWTEST>(compInfo);
} }
compInfo.renderState.previouslyRenderedLayerID = layerID;
} //layer enabled } //layer enabled
} }
} }
@ -4374,6 +4404,8 @@ void GPUEngineBase::_RenderLine_Layers(const size_t l)
{ {
this->_RenderLine_LayerOBJ<GPUCompositorMode_Unknown, OUTPUTFORMAT, WILLPERFORMWINDOWTEST>(compInfo, item); this->_RenderLine_LayerOBJ<GPUCompositorMode_Unknown, OUTPUTFORMAT, WILLPERFORMWINDOWTEST>(compInfo, item);
} }
compInfo.renderState.previouslyRenderedLayerID = GPULayerID_OBJ;
} }
} }
} }
@ -5109,6 +5141,7 @@ void GPUEngineBase::RenderLayerBG(const GPULayerID layerID, u16 *dstColorBuffer)
memset(&compInfo, 0, sizeof(compInfo)); memset(&compInfo, 0, sizeof(compInfo));
compInfo.renderState.displayOutputMode = GPUDisplayMode_Normal; compInfo.renderState.displayOutputMode = GPUDisplayMode_Normal;
compInfo.renderState.previouslyRenderedLayerID = GPULayerID_Backdrop;
compInfo.renderState.selectedLayerID = layerID; compInfo.renderState.selectedLayerID = layerID;
compInfo.renderState.selectedBGLayer = &this->_BGLayer[layerID]; compInfo.renderState.selectedBGLayer = &this->_BGLayer[layerID];
compInfo.renderState.colorEffect = ColorEffect_Disable; compInfo.renderState.colorEffect = ColorEffect_Disable;
@ -8178,8 +8211,8 @@ void GPUSubsystem::RenderLine(const size_t l)
this->_frameNeedsFinish = true; this->_frameNeedsFinish = true;
} }
this->_engineMain->UpdateRenderStates(l); this->_engineMain->UpdateRenderStates<OUTPUTFORMAT>(l);
this->_engineSub->UpdateRenderStates(l); this->_engineSub->UpdateRenderStates<OUTPUTFORMAT>(l);
const bool isDisplayCaptureNeeded = this->_engineMain->WillDisplayCapture(l); const bool isDisplayCaptureNeeded = this->_engineMain->WillDisplayCapture(l);
const bool isFramebufferRenderNeeded[2] = { this->_engineMain->GetEnableStateApplied(), this->_engineSub->GetEnableStateApplied() }; const bool isFramebufferRenderNeeded[2] = { this->_engineMain->GetEnableStateApplied(), this->_engineSub->GetEnableStateApplied() };

5
desmume/src/GPU.h
View File

@ -1242,11 +1242,14 @@ typedef struct
typedef struct typedef struct
{ {
GPULayerID previouslyRenderedLayerID;
GPULayerID selectedLayerID; GPULayerID selectedLayerID;
BGLayerInfo *selectedBGLayer; BGLayerInfo *selectedBGLayer;
GPUDisplayMode displayOutputMode; GPUDisplayMode displayOutputMode;
u16 backdropColor16; u16 backdropColor16;
u16 workingBackdropColor16;
FragmentColor workingBackdropColor32;
ColorEffect colorEffect; ColorEffect colorEffect;
u8 blendEVA; u8 blendEVA;
u8 blendEVB; u8 blendEVB;
@ -1529,7 +1532,7 @@ public:
virtual void Reset(); virtual void Reset();
void UpdateRenderStates(const size_t l); template<NDSColorFormat OUTPUTFORMAT> void UpdateRenderStates(const size_t l);
template<NDSColorFormat OUTPUTFORMAT> void RenderLine(const size_t l); template<NDSColorFormat OUTPUTFORMAT> void RenderLine(const size_t l);
void RefreshAffineStartRegs(); void RefreshAffineStartRegs();