The-Homebrew-Cloud/Cemu
2
0
Fork 0
mirror of https://github.com/cemu-project/Cemu.git synced 2024-12-01 21:44:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

emulate unsupported shadow sampler types

Browse Source
This commit is contained in:
Samo Z 2024-09-01 14:36:39 +02:00
parent f9f6260580
commit 5d07d115a6
3 changed files with 55 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/Cafe/HW/Latte/LegacyShaderDecompiler/LatteDecompilerEmitMSL.cpp
View File

@ -2246,6 +2246,7 @@ static void _emitTEXSampleTextureCode(LatteDecompilerShaderContext* shaderContex
} }
bool isCompare = shaderContext->shader->textureUsesDepthCompare[texInstruction->textureFetch.textureIndex]; bool isCompare = shaderContext->shader->textureUsesDepthCompare[texInstruction->textureFetch.textureIndex];
bool emulateCompare = (isCompare && !IsValidDepthTextureType(texDim));
bool isGather = (texOpcode == GPU7_TEX_INST_FETCH4); bool isGather = (texOpcode == GPU7_TEX_INST_FETCH4);
bool unnormalizationHandled = false; bool unnormalizationHandled = false;
@ -2265,25 +2266,40 @@ static void _emitTEXSampleTextureCode(LatteDecompilerShaderContext* shaderContex
return; return;
} }
src->addFmt("tex{}.", texInstruction->textureFetch.textureIndex); if (emulateCompare)
if ((texOpcode == GPU7_TEX_INST_SAMPLE && (texInstruction->textureFetch.unnormalized[0] && texInstruction->textureFetch.unnormalized[1] && texInstruction->textureFetch.unnormalized[2] && texInstruction->textureFetch.unnormalized[3])) ||
texOpcode == GPU7_TEX_INST_LD)
{ {
if (hasOffset) cemu_assert_debug(!isGather);
cemu_assert_unimplemented();
src->add("read("); src->add("sampleCompareEmulate(");
unnormalizationHandled = true; }
useTexelCoordinates = true;
src->addFmt("tex{}", texInstruction->textureFetch.textureIndex);
if (!emulateCompare)
{
src->add(".");
if ((texOpcode == GPU7_TEX_INST_SAMPLE && (texInstruction->textureFetch.unnormalized[0] && texInstruction->textureFetch.unnormalized[1] && texInstruction->textureFetch.unnormalized[2] && texInstruction->textureFetch.unnormalized[3])) ||
texOpcode == GPU7_TEX_INST_LD)
{
if (hasOffset)
cemu_assert_unimplemented();
src->add("read(");
unnormalizationHandled = true;
useTexelCoordinates = true;
}
else
{
if (isGather)
src->add("gather");
else
src->add("sample");
if (isCompare)
src->add("_compare");
src->addFmt("(samplr{}, ", texInstruction->textureFetch.textureIndex);
}
} }
else else
{ {
if (isGather) src->addFmt(", samplr{}, ", texInstruction->textureFetch.textureIndex);
src->add("gather");
else
src->add("sample");
if (isCompare)
src->add("_compare");
src->addFmt("(samplr{}, ", texInstruction->textureFetch.textureIndex);
} }
// for textureGather() add shift (todo: depends on rounding mode set in sampler registers?) // for textureGather() add shift (todo: depends on rounding mode set in sampler registers?)
@ -3719,6 +3735,19 @@ void LatteDecompiler_emitHelperFunctions(LatteDecompilerShaderContext* shaderCon
"}\r\n"); "}\r\n");
} }
// Sample compare emulate
// TODO: only add when needed
// TODO: lod_options overload
// TODO: when the sampler has linear min mag filter, use gather and filter manually
// TODO: offset?
fCStr_shaderSource->add(""
"template<typename TextureT, typename CoordT>\r\n"
"float sampleCompareEmulate(TextureT tex, sampler samplr, CoordT coord, float compareValue) {\r\n"
"return compareValue < tex.sample(samplr, coord).x ? 1.0 : 0.0;\r\n"
"}\r\n"
);
// clamp // clamp
fCStr_shaderSource->add("" fCStr_shaderSource->add(""
"int clampFI32(int v)\r\n" "int clampFI32(int v)\r\n"

6
src/Cafe/HW/Latte/LegacyShaderDecompiler/LatteDecompilerEmitMSLHeader.hpp
View File

@ -1,7 +1,8 @@
#pragma once #pragma once
#include "Common/precompiled.h" #include "Common/precompiled.h"
#include "HW/Latte/Core/LatteConst.h" #include "Cafe/HW/Latte/Renderer/Metal/MetalCommon.h"
namespace LatteDecompiler namespace LatteDecompiler
{ {
static void _emitUniformVariables(LatteDecompilerShaderContext* decompilerContext) static void _emitUniformVariables(LatteDecompilerShaderContext* decompilerContext)
@ -442,7 +443,8 @@ namespace LatteDecompiler
src->add(", "); src->add(", ");
if (shaderContext->shader->textureUsesDepthCompare[i]) // Only 2D and 2D array textures can be used with comparison samplers
if (shaderContext->shader->textureUsesDepthCompare[i] && IsValidDepthTextureType(shaderContext->shader->textureUnitDim[i]))
src->add("depth"); src->add("depth");
else else
src->add("texture"); src->add("texture");

7
src/Cafe/HW/Latte/Renderer/Metal/MetalCommon.h
View File

@ -3,6 +3,8 @@
#include <Foundation/Foundation.hpp> #include <Foundation/Foundation.hpp>
#include <Metal/Metal.hpp> #include <Metal/Metal.hpp>
#include "Cafe/HW/Latte/Core/LatteConst.h"
struct MetalPixelFormatSupport struct MetalPixelFormatSupport
{ {
bool m_supportsR8Unorm_sRGB; bool m_supportsR8Unorm_sRGB;
@ -62,3 +64,8 @@ inline NS::String* GetLabel(const std::string& label, const void* identifier)
} }
constexpr MTL::RenderStages ALL_MTL_RENDER_STAGES = MTL::RenderStageVertex | MTL::RenderStageObject | MTL::RenderStageMesh | MTL::RenderStageFragment; constexpr MTL::RenderStages ALL_MTL_RENDER_STAGES = MTL::RenderStageVertex | MTL::RenderStageObject | MTL::RenderStageMesh | MTL::RenderStageFragment;
inline bool IsValidDepthTextureType(Latte::E_DIM dim)
{
return (dim == Latte::E_DIM::DIM_2D || dim == Latte::E_DIM::DIM_2D_MSAA || dim == Latte::E_DIM::DIM_2D_ARRAY || dim == Latte::E_DIM::DIM_2D_ARRAY_MSAA || dim == Latte::E_DIM::DIM_CUBEMAP);
}