octo
/
yuzu-mainline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reimplement get component type, uncomment mistaken code

This commit is contained in:
namkazy 2020-03-22 20:29:46 +07:00
parent 3ad06e9b2b
commit 658112783d
1 changed files with 93 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
src/video_core/shader/decode/image.cpp
View File

@ -29,22 +29,97 @@ using Tegra::Texture::TICEntry;
namespace { namespace {
ComponentType GetComponentType(TICEntry tic, std::size_t component) { ComponentType GetComponentType(TICEntry tic, std::size_t component) {
constexpr u8 R = 0b0001; const TextureFormat format{tic.format};
constexpr u8 G = 0b0010; switch (format) {
constexpr u8 B = 0b0100; case TextureFormat::R16_G16_B16_A16:
constexpr u8 A = 0b1000; case TextureFormat::R32_G32_B32_A32:
if (R & component) { case TextureFormat::R32_G32_B32:
case TextureFormat::R32_G32:
case TextureFormat::R16_G16:
case TextureFormat::R32:
case TextureFormat::R16:
case TextureFormat::R8:
case TextureFormat::R1:
if (0 == component) {
return tic.r_type; return tic.r_type;
} }
if (G & component) { if (1 == component) {
return tic.g_type; return tic.g_type;
} }
if (B & component) { if (2 == component) {
return tic.b_type; return tic.b_type;
} }
if (A & component) { if (3 == component) {
return tic.a_type; return tic.a_type;
} }
break;
case TextureFormat::A8R8G8B8:
if (0 == component) {
return tic.a_type;
}
if (1 == component) {
return tic.r_type;
}
if (2 == component) {
return tic.g_type;
}
if (3 == component) {
return tic.b_type;
}
break;
case TextureFormat::A2B10G10R10:
case TextureFormat::A4B4G4R4:
case TextureFormat::A5B5G5R1:
case TextureFormat::A1B5G5R5:
if (0 == component) {
return tic.a_type;
}
if (1 == component) {
return tic.b_type;
}
if (2 == component) {
return tic.g_type;
}
if (3 == component) {
return tic.r_type;
}
break;
case TextureFormat::R32_B24G8:
if (0 == component) {
return tic.r_type;
}
if (1 == component) {
return tic.b_type;
}
if (2 == component) {
return tic.g_type;
}
break;
case TextureFormat::B5G6R5:
case TextureFormat::B6G5R5:
if (0 == component) {
return tic.b_type;
}
if (1 == component) {
return tic.g_type;
}
if (2 == component) {
return tic.r_type;
}
break;
case TextureFormat::G8R24:
case TextureFormat::G24R8:
case TextureFormat::G8R8:
case TextureFormat::G4R4:
if (0 == component) {
return tic.g_type;
}
if (1 == component) {
return tic.r_type;
}
break;
}
UNIMPLEMENTED_MSG("texture format not implement={}", format);
return ComponentType::FLOAT; return ComponentType::FLOAT;
} }
@ -298,9 +373,9 @@ u32 ShaderIR::DecodeImage(NodeBlock& bb, u32 pc) {
shifted_counter += component_size; shifted_counter += component_size;
const auto shifted = 32 - shifted_counter; const auto shifted = 32 - shifted_counter;
if (shifted > 0) { if (shifted > 0) {
/* converted_value = converted_value =
SignedOperation(OperationCode::ILogicalShiftLeft, is_signed, SignedOperation(OperationCode::ILogicalShiftLeft, is_signed,
std::move(converted_value), Immediate(shifted));*/ std::move(converted_value), Immediate(shifted));
} }
// add value into result // add value into result