Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Port some accessors over from #9255 to be able to catch these changes and dirty state later.

Browse source
This commit is contained in:
Henrik Rydgård 2017-04-03 17:04:58 +02:00
parent 1faae8b6d6
commit 5a8e9c4f71
10 changed files with 40 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
GPU/Common/TextureCacheCommon.cpp
View file

@ -1414,8 +1414,8 @@ void TextureCacheCommon::ApplyTexture() {
ApplyTextureFramebuffer(entry, entry->framebuffer); ApplyTextureFramebuffer(entry, entry->framebuffer);
} else { } else {
BindTexture(entry); BindTexture(entry);
gstate_c.textureFullAlpha = entry->GetAlphaStatus() == TexCacheEntry::STATUS_ALPHA_FULL; gstate_c.SetTextureFullAlpha(entry->GetAlphaStatus() == TexCacheEntry::STATUS_ALPHA_FULL);
gstate_c.textureSimpleAlpha = entry->GetAlphaStatus() != TexCacheEntry::STATUS_ALPHA_UNKNOWN; gstate_c.SetTextureSimpleAlpha(entry->GetAlphaStatus() != TexCacheEntry::STATUS_ALPHA_UNKNOWN);
} }
} }

4
GPU/D3D11/StateMappingD3D11.cpp
View file

@ -139,7 +139,7 @@ void DrawEngineD3D11::ApplyDrawState(int prim) {
// Blend // Blend
{ {
gstate_c.allowShaderBlend = !g_Config.bDisableSlowFramebufEffects; gstate_c.SetAllowShaderBlend(!g_Config.bDisableSlowFramebufEffects);
if (gstate.isModeClear()) { if (gstate.isModeClear()) {
keys_.blend.value = 0; // full wipe keys_.blend.value = 0; // full wipe
keys_.blend.blendEnable = false; keys_.blend.blendEnable = false;
@ -159,7 +159,7 @@ void DrawEngineD3D11::ApplyDrawState(int prim) {
} else { } else {
// Until next time, force it off. // Until next time, force it off.
ResetShaderBlending(); ResetShaderBlending();
gstate_c.allowShaderBlend = false; gstate_c.SetAllowShaderBlend(false);
} }
} else if (blendState.resetShaderBlending) { } else if (blendState.resetShaderBlending) {
ResetShaderBlending(); ResetShaderBlending();

8
GPU/D3D11/TextureCacheD3D11.cpp
View file

@ -424,15 +424,15 @@ void TextureCacheD3D11::ApplyTextureFramebuffer(TexCacheEntry *entry, VirtualFra
const u32 clutTotalColors = clutMaxBytes_ / bytesPerColor; const u32 clutTotalColors = clutMaxBytes_ / bytesPerColor;
TexCacheEntry::Status alphaStatus = CheckAlpha(clutBuf_, GetClutDestFormatD3D11(clutFormat), clutTotalColors, clutTotalColors, 1); TexCacheEntry::Status alphaStatus = CheckAlpha(clutBuf_, GetClutDestFormatD3D11(clutFormat), clutTotalColors, clutTotalColors, 1);
gstate_c.textureFullAlpha = alphaStatus == TexCacheEntry::STATUS_ALPHA_FULL; gstate_c.SetTextureFullAlpha(alphaStatus == TexCacheEntry::STATUS_ALPHA_FULL);
gstate_c.textureSimpleAlpha = alphaStatus == TexCacheEntry::STATUS_ALPHA_SIMPLE; gstate_c.SetTextureSimpleAlpha(alphaStatus == TexCacheEntry::STATUS_ALPHA_SIMPLE);
} else { } else {
entry->status &= ~TexCacheEntry::STATUS_DEPALETTIZE; entry->status &= ~TexCacheEntry::STATUS_DEPALETTIZE;
framebufferManagerD3D11_->BindFramebufferAsColorTexture(0, framebuffer, BINDFBCOLOR_MAY_COPY_WITH_UV | BINDFBCOLOR_APPLY_TEX_OFFSET); framebufferManagerD3D11_->BindFramebufferAsColorTexture(0, framebuffer, BINDFBCOLOR_MAY_COPY_WITH_UV | BINDFBCOLOR_APPLY_TEX_OFFSET);
gstate_c.textureFullAlpha = gstate.getTextureFormat() == GE_TFMT_5650; gstate_c.SetTextureFullAlpha(gstate.getTextureFormat() == GE_TFMT_5650);
gstate_c.textureSimpleAlpha = gstate_c.textureFullAlpha; gstate_c.SetTextureSimpleAlpha(gstate_c.textureFullAlpha);
framebufferManagerD3D11_->RebindFramebuffer(); framebufferManagerD3D11_->RebindFramebuffer();
} }
SamplerCacheKey samplerKey; SamplerCacheKey samplerKey;

4
GPU/Directx9/StateMappingDX9.cpp
View file

@ -117,7 +117,7 @@ void DrawEngineDX9::ApplyDrawState(int prim) {
{ {
// Unfortunately, this isn't implemented yet. // Unfortunately, this isn't implemented yet.
gstate_c.allowShaderBlend = false; gstate_c.SetAllowShaderBlend(false);
if (gstate.isModeClear()) { if (gstate.isModeClear()) {
dxstate.blend.disable(); dxstate.blend.disable();
@ -137,7 +137,7 @@ void DrawEngineDX9::ApplyDrawState(int prim) {
} else { } else {
// Until next time, force it off. // Until next time, force it off.
ResetShaderBlending(); ResetShaderBlending();
gstate_c.allowShaderBlend = false; gstate_c.SetAllowShaderBlend(false);
} }
} else if (blendState.resetShaderBlending) { } else if (blendState.resetShaderBlending) {
ResetShaderBlending(); ResetShaderBlending();

8
GPU/Directx9/TextureCacheDX9.cpp
View file

@ -445,15 +445,15 @@ void TextureCacheDX9::ApplyTextureFramebuffer(TexCacheEntry *entry, VirtualFrame
const u32 clutTotalColors = clutMaxBytes_ / bytesPerColor; const u32 clutTotalColors = clutMaxBytes_ / bytesPerColor;
TexCacheEntry::Status alphaStatus = CheckAlpha(clutBuf_, getClutDestFormat(clutFormat), clutTotalColors, clutTotalColors, 1); TexCacheEntry::Status alphaStatus = CheckAlpha(clutBuf_, getClutDestFormat(clutFormat), clutTotalColors, clutTotalColors, 1);
gstate_c.textureFullAlpha = alphaStatus == TexCacheEntry::STATUS_ALPHA_FULL; gstate_c.SetTextureFullAlpha(alphaStatus == TexCacheEntry::STATUS_ALPHA_FULL);
gstate_c.textureSimpleAlpha = alphaStatus == TexCacheEntry::STATUS_ALPHA_SIMPLE; gstate_c.SetTextureSimpleAlpha(alphaStatus == TexCacheEntry::STATUS_ALPHA_SIMPLE);
} else { } else {
entry->status &= ~TexCacheEntry::STATUS_DEPALETTIZE; entry->status &= ~TexCacheEntry::STATUS_DEPALETTIZE;
framebufferManagerDX9_->BindFramebufferAsColorTexture(0, framebuffer, BINDFBCOLOR_MAY_COPY_WITH_UV | BINDFBCOLOR_APPLY_TEX_OFFSET); framebufferManagerDX9_->BindFramebufferAsColorTexture(0, framebuffer, BINDFBCOLOR_MAY_COPY_WITH_UV | BINDFBCOLOR_APPLY_TEX_OFFSET);
gstate_c.textureFullAlpha = gstate.getTextureFormat() == GE_TFMT_5650; gstate_c.SetTextureFullAlpha(gstate.getTextureFormat() == GE_TFMT_5650);
gstate_c.textureSimpleAlpha = gstate_c.textureFullAlpha; gstate_c.SetTextureSimpleAlpha(gstate_c.textureFullAlpha);
} }
framebufferManagerDX9_->RebindFramebuffer(); framebufferManagerDX9_->RebindFramebuffer();

4
GPU/GLES/StateMappingGLES.cpp
View file

@ -159,7 +159,7 @@ void DrawEngineGLES::ApplyDrawState(int prim) {
bool useBufferedRendering = g_Config.iRenderingMode != FB_NON_BUFFERED_MODE; bool useBufferedRendering = g_Config.iRenderingMode != FB_NON_BUFFERED_MODE;
{ {
gstate_c.allowShaderBlend = !g_Config.bDisableSlowFramebufEffects; gstate_c.SetAllowShaderBlend(!g_Config.bDisableSlowFramebufEffects);
if (gstate.isModeClear()) { if (gstate.isModeClear()) {
glstate.blend.disable(); glstate.blend.disable();
@ -186,7 +186,7 @@ void DrawEngineGLES::ApplyDrawState(int prim) {
} else { } else {
// Until next time, force it off. // Until next time, force it off.
ResetShaderBlending(); ResetShaderBlending();
gstate_c.allowShaderBlend = false; gstate_c.SetAllowShaderBlend(false);
} }
} else if (blendState.resetShaderBlending) { } else if (blendState.resetShaderBlending) {
ResetShaderBlending(); ResetShaderBlending();

8
GPU/GLES/TextureCacheGLES.cpp
View file

@ -503,15 +503,15 @@ void TextureCacheGLES::ApplyTextureFramebuffer(TexCacheEntry *entry, VirtualFram
const u32 clutTotalColors = clutMaxBytes_ / bytesPerColor; const u32 clutTotalColors = clutMaxBytes_ / bytesPerColor;
TexCacheEntry::Status alphaStatus = CheckAlpha(clutBuf_, getClutDestFormat(clutFormat), clutTotalColors, clutTotalColors, 1); TexCacheEntry::Status alphaStatus = CheckAlpha(clutBuf_, getClutDestFormat(clutFormat), clutTotalColors, clutTotalColors, 1);
gstate_c.textureFullAlpha = alphaStatus == TexCacheEntry::STATUS_ALPHA_FULL; gstate_c.SetTextureFullAlpha(alphaStatus == TexCacheEntry::STATUS_ALPHA_FULL);
gstate_c.textureSimpleAlpha = alphaStatus == TexCacheEntry::STATUS_ALPHA_SIMPLE; gstate_c.SetTextureSimpleAlpha(alphaStatus == TexCacheEntry::STATUS_ALPHA_SIMPLE);
} else { } else {
entry->status &= ~TexCacheEntry::STATUS_DEPALETTIZE; entry->status &= ~TexCacheEntry::STATUS_DEPALETTIZE;
framebufferManagerGL_->BindFramebufferAsColorTexture(0, framebuffer, BINDFBCOLOR_MAY_COPY_WITH_UV | BINDFBCOLOR_APPLY_TEX_OFFSET); framebufferManagerGL_->BindFramebufferAsColorTexture(0, framebuffer, BINDFBCOLOR_MAY_COPY_WITH_UV | BINDFBCOLOR_APPLY_TEX_OFFSET);
gstate_c.textureFullAlpha = gstate.getTextureFormat() == GE_TFMT_5650; gstate_c.SetTextureFullAlpha(gstate.getTextureFormat() == GE_TFMT_5650);
gstate_c.textureSimpleAlpha = gstate_c.textureFullAlpha; gstate_c.SetTextureSimpleAlpha(gstate_c.textureFullAlpha);
} }
framebufferManagerGL_->RebindFramebuffer(); framebufferManagerGL_->RebindFramebuffer();

12
GPU/GPUState.h
View file

@ -501,6 +501,18 @@ struct GPUStateCache {
bool IsDirty(u64 what) const { bool IsDirty(u64 what) const {
return (dirty & what) != 0ULL; return (dirty & what) != 0ULL;
} }
void SetTextureFullAlpha(bool fullAlpha) {
textureFullAlpha = fullAlpha;
}
void SetTextureSimpleAlpha(bool simpleAlpha) {
textureSimpleAlpha = simpleAlpha;
}
void SetNeedShaderTexclamp(bool need) {
needShaderTexClamp = need;
}
void SetAllowShaderBlend(bool allow) {
allowShaderBlend = allow;
}
u32 featureFlags; u32 featureFlags;

4
GPU/Vulkan/StateMappingVulkan.cpp
View file

@ -136,7 +136,7 @@ void DrawEngineVulkan::ConvertStateToVulkanKey(FramebufferManagerVulkan &fbManag
{ {
// Unfortunately, this isn't implemented yet. // Unfortunately, this isn't implemented yet.
gstate_c.allowShaderBlend = false; gstate_c.SetAllowShaderBlend(false);
if (gstate.isModeClear()) { if (gstate.isModeClear()) {
key.logicOpEnable = false; key.logicOpEnable = false;
key.blendEnable = false; key.blendEnable = false;
@ -159,7 +159,7 @@ void DrawEngineVulkan::ConvertStateToVulkanKey(FramebufferManagerVulkan &fbManag
} else { } else {
// Until next time, force it off. // Until next time, force it off.
ResetShaderBlending(); ResetShaderBlending();
gstate_c.allowShaderBlend = false; gstate_c.SetAllowShaderBlend(false);
} }
} else if (blendState.resetShaderBlending) { } else if (blendState.resetShaderBlending) {
ResetShaderBlending(); ResetShaderBlending();

12
GPU/Vulkan/TextureCacheVulkan.cpp
View file

@ -429,13 +429,13 @@ void TextureCacheVulkan::ApplyTextureFramebuffer(TexCacheEntry *entry, VirtualFr
const u32 clutTotalColors = clutMaxBytes_ / bytesPerColor; const u32 clutTotalColors = clutMaxBytes_ / bytesPerColor;
TexCacheEntry::Status alphaStatus = CheckAlpha(clutBuf_, getClutDestFormatVulkan(clutFormat), clutTotalColors, clutTotalColors, 1); TexCacheEntry::Status alphaStatus = CheckAlpha(clutBuf_, getClutDestFormatVulkan(clutFormat), clutTotalColors, clutTotalColors, 1);
gstate_c.textureFullAlpha = alphaStatus == TexCacheEntry::STATUS_ALPHA_FULL; gstate_c.SetTextureFullAlpha(alphaStatus == TexCacheEntry::STATUS_ALPHA_FULL);
gstate_c.textureSimpleAlpha = alphaStatus == TexCacheEntry::STATUS_ALPHA_SIMPLE; gstate_c.SetTextureSimpleAlpha(alphaStatus == TexCacheEntry::STATUS_ALPHA_SIMPLE);
} else { } else {
entry->status &= ~TexCacheEntry::STATUS_DEPALETTIZE; entry->status &= ~TexCacheEntry::STATUS_DEPALETTIZE;
gstate_c.textureFullAlpha = gstate.getTextureFormat() == GE_TFMT_5650; gstate_c.SetTextureFullAlpha(gstate.getTextureFormat() == GE_TFMT_5650);
gstate_c.textureSimpleAlpha = gstate_c.textureFullAlpha; gstate_c.SetTextureSimpleAlpha(gstate_c.textureFullAlpha);
} }
/* /*
@ -683,8 +683,8 @@ void TextureCacheVulkan::BuildTexture(TexCacheEntry *const entry, bool replaceIm
entry->vkTex->texture_->EndCreate(); entry->vkTex->texture_->EndCreate();
gstate_c.textureFullAlpha = entry->GetAlphaStatus() == TexCacheEntry::STATUS_ALPHA_FULL; gstate_c.SetTextureFullAlpha(entry->GetAlphaStatus() == TexCacheEntry::STATUS_ALPHA_FULL);
gstate_c.textureSimpleAlpha = entry->GetAlphaStatus() != TexCacheEntry::STATUS_ALPHA_UNKNOWN; gstate_c.SetTextureSimpleAlpha(entry->GetAlphaStatus() != TexCacheEntry::STATUS_ALPHA_UNKNOWN);
} }
VkFormat TextureCacheVulkan::GetDestFormat(GETextureFormat format, GEPaletteFormat clutFormat) const { VkFormat TextureCacheVulkan::GetDestFormat(GETextureFormat format, GEPaletteFormat clutFormat) const {