preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-13 06:20:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Minor code simplification

Browse Source
This commit is contained in:
Henrik Rydgård committed 2022-07-30 10:32:50 +02:00
1 parent 7d4d925a32
commit 8b398bbbb7
4 files changed
+13 -12
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

GPU/D3D11/TextureCacheD3D11.cpp
+5 -6
View File
@@ -518,16 +518,15 @@ void TextureCacheD3D11::BuildTexture(TexCacheEntry *const entry) {
maxLevel = 0;
}
DXGI_FORMAT dstFmt = GetDestFormat(GETextureFormat(entry->format), gstate.getClutPaletteFormat());
int level = 0;
if (IsFakeMipmapChange()) {
// NOTE: Since the level is not part of the cache key, we assume it never changes.
u8 level = std::max(0, gstate.getTexLevelOffset16() / 16);
LoadTextureLevel(*entry, replaced, level, maxLevel, scaleFactor, dstFmt);
} else {
LoadTextureLevel(*entry, replaced, 0, maxLevel, scaleFactor, dstFmt);
level = std::max(0, gstate.getTexLevelOffset16() / 16);
}
DXGI_FORMAT dstFmt = GetDestFormat(GETextureFormat(entry->format), gstate.getClutPaletteFormat());
LoadTextureLevel(*entry, replaced, level, maxLevel, scaleFactor, dstFmt);
ID3D11ShaderResourceView *textureView = DxView(entry);
if (!textureView) {
return;
GPU/Directx9/TextureCacheDX9.cpp
+2 -1
View File
@@ -474,11 +474,12 @@ void TextureCacheDX9::BuildTexture(TexCacheEntry *const entry) {
maxLevel = 0;
}
u8 level = 0;
int level = 0;
if (IsFakeMipmapChange()) {
// NOTE: Since the level is not part of the cache key, we assume it never changes.
level = std::max(0, gstate.getTexLevelOffset16() / 16);
}
LoadTextureLevel(*entry, replaced, level, maxLevel, scaleFactor, dstFmt);
LPDIRECT3DTEXTURE9 &texture = DxTex(entry);
GPU/GLES/TextureCacheGLES.cpp
+4 -3
View File
@@ -521,11 +521,12 @@ void TextureCacheGLES::BuildTexture(TexCacheEntry *const entry) {
// be as good quality as the game's own (might even be better in some cases though).
// Always load base level texture here
u8 level = 0;
int level = 0;
if (IsFakeMipmapChange()) {
// NOTE: Since the level is not part of the cache key, we assume it never changes.
level = std::max(0, gstate.getTexLevelOffset16() / 16);
}
LoadTextureLevel(*entry, replaced, level, scaleFactor, dstFmt);
// Mipmapping is only enabled when texture scaling is disabled.
@@ -560,6 +561,8 @@ void TextureCacheGLES::BuildTexture(TexCacheEntry *const entry) {
texMaxLevel = 0;
}
render_->FinalizeTexture(entry->textureName, texMaxLevel, genMips);
if (maxLevel == 0) {
entry->status |= TexCacheEntry::STATUS_BAD_MIPS;
} else {
@@ -568,8 +571,6 @@ void TextureCacheGLES::BuildTexture(TexCacheEntry *const entry) {
if (replaced.Valid()) {
entry->SetAlphaStatus(TexCacheEntry::TexStatus(replaced.AlphaStatus()));
}
render_->FinalizeTexture(entry->textureName, texMaxLevel, genMips);
}
Draw::DataFormat TextureCacheGLES::GetDestFormat(GETextureFormat format, GEPaletteFormat clutFormat) const {
GPU/Vulkan/TextureCacheVulkan.cpp
+2 -2
View File
@@ -916,6 +916,8 @@ void TextureCacheVulkan::BuildTexture(TexCacheEntry *const entry) {
prevStage = VK_PIPELINE_STAGE_TRANSFER_BIT;
VK_PROFILE_END(vulkan, cmdInit, VK_PIPELINE_STAGE_TRANSFER_BIT);
}
entry->vkTex->EndCreate(cmdInit, false, computeUpload ? VK_IMAGE_LAYOUT_GENERAL : VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL);
VK_PROFILE_END(vulkan, cmdInit, VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT);
if (maxLevel == 0) {
entry->status |= TexCacheEntry::STATUS_BAD_MIPS;
@@ -925,8 +927,6 @@ void TextureCacheVulkan::BuildTexture(TexCacheEntry *const entry) {
if (replaced.Valid()) {
entry->SetAlphaStatus(TexCacheEntry::TexStatus(replaced.AlphaStatus()));
}
entry->vkTex->EndCreate(cmdInit, false, prevStage, layout);
VK_PROFILE_END(vulkan, cmdInit, VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT);
}
}