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

gl_shader_decompiler: Inline textureGather component

This commit is contained in:
ReinUsesLisp 2019-01-07 20:31:47 -03:00
parent 1c9c4eefeb
commit 51de4e00a6
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/video_core/renderer_opengl/gl_shader_decompiler.cpp
View File

@ -689,7 +689,7 @@ private:
} }
std::string GenerateTexture(Operation operation, const std::string& func, std::string GenerateTexture(Operation operation, const std::string& func,
std::string extra_cast(std::string) = nullptr) { bool is_extra_int = false) {
constexpr std::array<const char*, 4> coord_constructors = {"float", "vec2", "vec3", "vec4"}; constexpr std::array<const char*, 4> coord_constructors = {"float", "vec2", "vec3", "vec4"};
const auto& meta = std::get<MetaTexture>(operation.GetMeta()); const auto& meta = std::get<MetaTexture>(operation.GetMeta());
@ -706,15 +706,24 @@ private:
const bool is_extra = i >= meta.coords_count; const bool is_extra = i >= meta.coords_count;
const bool is_array = i == meta.array_index; const bool is_array = i == meta.array_index;
std::string operand = Visit(operation[i]); std::string operand = [&]() {
if (is_extra && extra_cast != nullptr) { if (is_extra && is_extra_int) {
operand = extra_cast(operand); if (const auto immediate = std::get_if<ImmediateNode>(operation[i])) {
return std::to_string(static_cast<s32>(immediate->GetValue()));
} else {
return "ftoi(" + Visit(operation[i]) + ')';
} }
} else {
return Visit(operation[i]);
}
}();
if (is_array) { if (is_array) {
ASSERT(!is_extra); ASSERT(!is_extra);
operand = "float(ftoi(" + operand + "))"; operand = "float(ftoi(" + operand + "))";
} }
expr += operand; expr += operand;
if (i + 1 == meta.coords_count) { if (i + 1 == meta.coords_count) {
expr += ')'; expr += ')';
} }
@ -1118,16 +1127,8 @@ private:
std::string F4TextureGather(Operation operation) { std::string F4TextureGather(Operation operation) {
const auto meta = std::get<MetaTexture>(operation.GetMeta()); const auto meta = std::get<MetaTexture>(operation.GetMeta());
return GenerateTexture(operation, "textureGather", !meta.sampler.IsShadow()) +
std::string expr; GetSwizzle(meta.element);
if (meta.sampler.IsShadow()) {
expr = GenerateTexture(operation, "textureGather",
[](std::string ref_z) { return ref_z; });
} else {
expr = GenerateTexture(operation, "textureGather",
[](std::string comp) { return "ftoi(" + comp + ')'; });
}
return expr + GetSwizzle(meta.element);
} }
std::string F4TextureQueryDimensions(Operation operation) { std::string F4TextureQueryDimensions(Operation operation) {