summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFernando Sahmkow <fsahmkow27@gmail.com>2020-03-14 14:49:05 +0100
committerGitHub <noreply@github.com>2020-03-14 14:49:05 +0100
commitc51dbf80388b5d31ac6e48cceb2968c7d8226477 (patch)
tree8baeb6ac2f241c406bf13541904fd42b55bd7bb9
parentMerge pull request #3499 from ReinUsesLisp/depth-2d-array (diff)
parenttexture_cache: Report incompatible textures as black (diff)
downloadyuzu-c51dbf80388b5d31ac6e48cceb2968c7d8226477.tar
yuzu-c51dbf80388b5d31ac6e48cceb2968c7d8226477.tar.gz
yuzu-c51dbf80388b5d31ac6e48cceb2968c7d8226477.tar.bz2
yuzu-c51dbf80388b5d31ac6e48cceb2968c7d8226477.tar.lz
yuzu-c51dbf80388b5d31ac6e48cceb2968c7d8226477.tar.xz
yuzu-c51dbf80388b5d31ac6e48cceb2968c7d8226477.tar.zst
yuzu-c51dbf80388b5d31ac6e48cceb2968c7d8226477.zip
-rw-r--r--src/video_core/texture_cache/texture_cache.h41
1 files changed, 39 insertions, 2 deletions
diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h
index 51373b687..6cdbe63d0 100644
--- a/src/video_core/texture_cache/texture_cache.h
+++ b/src/video_core/texture_cache/texture_cache.h
@@ -104,6 +104,11 @@ public:
if (!cache_addr) {
return GetNullSurface(SurfaceParams::ExpectedTarget(entry));
}
+
+ if (!IsTypeCompatible(tic.texture_type, entry)) {
+ return GetNullSurface(SurfaceParams::ExpectedTarget(entry));
+ }
+
const auto params{SurfaceParams::CreateForTexture(format_lookup_table, tic, entry)};
const auto [surface, view] = GetSurface(gpu_addr, cache_addr, params, true, false);
if (guard_samplers) {
@@ -914,13 +919,15 @@ private:
params.width = 1;
params.height = 1;
params.depth = 1;
+ if (target == SurfaceTarget::TextureCubemap || target == SurfaceTarget::TextureCubeArray) {
+ params.depth = 6;
+ }
params.pitch = 4;
params.num_levels = 1;
params.emulated_levels = 1;
- params.pixel_format = VideoCore::Surface::PixelFormat::RGBA16F;
+ params.pixel_format = VideoCore::Surface::PixelFormat::R8U;
params.type = VideoCore::Surface::SurfaceType::ColorTexture;
auto surface = CreateSurface(0ULL, params);
- invalid_memory.clear();
invalid_memory.resize(surface->GetHostSizeInBytes(), 0U);
surface->UploadTexture(invalid_memory);
surface->MarkAsModified(false, Tick());
@@ -1082,6 +1089,36 @@ private:
return siblings_table[static_cast<std::size_t>(format)];
}
+ /// Returns true the shader sampler entry is compatible with the TIC texture type.
+ static bool IsTypeCompatible(Tegra::Texture::TextureType tic_type,
+ const VideoCommon::Shader::Sampler& entry) {
+ const auto shader_type = entry.GetType();
+ switch (tic_type) {
+ case Tegra::Texture::TextureType::Texture1D:
+ case Tegra::Texture::TextureType::Texture1DArray:
+ return shader_type == Tegra::Shader::TextureType::Texture1D;
+ case Tegra::Texture::TextureType::Texture1DBuffer:
+ // TODO(Rodrigo): Assume as valid for now
+ return true;
+ case Tegra::Texture::TextureType::Texture2D:
+ case Tegra::Texture::TextureType::Texture2DNoMipmap:
+ return shader_type == Tegra::Shader::TextureType::Texture2D;
+ case Tegra::Texture::TextureType::Texture2DArray:
+ return shader_type == Tegra::Shader::TextureType::Texture2D ||
+ shader_type == Tegra::Shader::TextureType::TextureCube;
+ case Tegra::Texture::TextureType::Texture3D:
+ return shader_type == Tegra::Shader::TextureType::Texture3D;
+ case Tegra::Texture::TextureType::TextureCubeArray:
+ case Tegra::Texture::TextureType::TextureCubemap:
+ if (shader_type == Tegra::Shader::TextureType::TextureCube) {
+ return true;
+ }
+ return shader_type == Tegra::Shader::TextureType::Texture2D && entry.IsArray();
+ }
+ UNREACHABLE();
+ return true;
+ }
+
struct FramebufferTargetInfo {
TSurface target;
TView view;