prifak/yuzu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge e5ba40e70c into df5a44a40b

Browse Source
This commit is contained in:
raven02
2018-09-15 15:44:50 +00:00
committed by GitHub
parent df5a44a40b e5ba40e70c
commit 7abe3584b9
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/video_core/engines/shader_bytecode.h
View File

@@ -757,6 +757,7 @@ public:
STG, // Store in global memory STG, // Store in global memory
TEX, TEX,
TXQ, // Texture Query TXQ, // Texture Query
TXB, // Texture Bias
TEXS, // Texture Fetch with scalar/non-vec4 source/destinations TEXS, // Texture Fetch with scalar/non-vec4 source/destinations
TLDS, // Texture Load with scalar/non-vec4 source/destinations TLDS, // Texture Load with scalar/non-vec4 source/destinations
TLD4, // Texture Load 4 TLD4, // Texture Load 4
@@ -990,6 +991,7 @@ private:
INST("1110111011011---", Id::STG, Type::Memory, "STG"), INST("1110111011011---", Id::STG, Type::Memory, "STG"),
INST("110000----111---", Id::TEX, Type::Memory, "TEX"), INST("110000----111---", Id::TEX, Type::Memory, "TEX"),
INST("1101111101001---", Id::TXQ, Type::Memory, "TXQ"), INST("1101111101001---", Id::TXQ, Type::Memory, "TXQ"),
INST("1101111010111---", Id::TXB, Type::Memory, "TXB"),
INST("1101100---------", Id::TEXS, Type::Memory, "TEXS"), INST("1101100---------", Id::TEXS, Type::Memory, "TEXS"),
INST("1101101---------", Id::TLDS, Type::Memory, "TLDS"), INST("1101101---------", Id::TLDS, Type::Memory, "TLDS"),
INST("110010----111---", Id::TLD4, Type::Memory, "TLD4"), INST("110010----111---", Id::TLD4, Type::Memory, "TLD4"),

3
src/video_core/renderer_opengl/gl_rasterizer_cache.h
View File

@@ -316,6 +316,8 @@ struct SurfaceParams {
return PixelFormat::R11FG11FB10F; return PixelFormat::R11FG11FB10F;
case Tegra::RenderTargetFormat::B5G6R5_UNORM: case Tegra::RenderTargetFormat::B5G6R5_UNORM:
return PixelFormat::B5G6R5U; return PixelFormat::B5G6R5U;
case Tegra::RenderTargetFormat::BGR5A1_UNORM:
return PixelFormat::A1B5G5R5U;
case Tegra::RenderTargetFormat::RGBA32_UINT: case Tegra::RenderTargetFormat::RGBA32_UINT:
return PixelFormat::RGBA32UI; return PixelFormat::RGBA32UI;
case Tegra::RenderTargetFormat::R8_UNORM: case Tegra::RenderTargetFormat::R8_UNORM:
@@ -576,6 +578,7 @@ struct SurfaceParams {
case Tegra::RenderTargetFormat::RG16_UNORM: case Tegra::RenderTargetFormat::RG16_UNORM:
case Tegra::RenderTargetFormat::R16_UNORM: case Tegra::RenderTargetFormat::R16_UNORM:
case Tegra::RenderTargetFormat::B5G6R5_UNORM: case Tegra::RenderTargetFormat::B5G6R5_UNORM:
case Tegra::RenderTargetFormat::BGR5A1_UNORM:
case Tegra::RenderTargetFormat::RG8_UNORM: case Tegra::RenderTargetFormat::RG8_UNORM:
case Tegra::RenderTargetFormat::RGBA16_UNORM: case Tegra::RenderTargetFormat::RGBA16_UNORM:
return ComponentType::UNorm; return ComponentType::UNorm;