Mirrors/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

settings,video_core: Consolidate ASTC decoding options

Browse source 
Just puts them all neatly into one place.
This commit is contained in:
lat9nq 2023-05-03 20:42:33 -04:00
parent c0202da9ac
commit 5cffa34288
12 changed files with 105 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/video_core/renderer_opengl/gl_texture_cache.cpp
View file

@ -232,10 +232,9 @@ void ApplySwizzle(GLuint handle, PixelFormat format, std::array<SwizzleSource, 4
[[nodiscard]] bool CanBeAccelerated(const TextureCacheRuntime& runtime,
const VideoCommon::ImageInfo& info) {
if (IsPixelFormatASTC(info.format) && info.size.depth == 1 && !runtime.HasNativeASTC()) {
return Settings::values.accelerate_astc.GetValue() &&
return Settings::values.accelerate_astc.GetValue() == Settings::AstcDecodeMode::GPU &&
Settings::values.astc_recompression.GetValue() ==
Settings::AstcRecompression::Uncompressed &&
!Settings::values.async_astc.GetValue();
Settings::AstcRecompression::Uncompressed;
}
// Disable other accelerated uploads for now as they don't implement swizzled uploads
return false;
@ -267,7 +266,8 @@ void ApplySwizzle(GLuint handle, PixelFormat format, std::array<SwizzleSource, 4
[[nodiscard]] bool CanBeDecodedAsync(const TextureCacheRuntime& runtime,
const VideoCommon::ImageInfo& info) {
if (IsPixelFormatASTC(info.format) && !runtime.HasNativeASTC()) {
return Settings::values.async_astc.GetValue();
return Settings::values.accelerate_astc.GetValue() ==
Settings::AstcDecodeMode::CPUAsynchronous;
}
return false;
}