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

gl_shader_decompiler: Address feedback

This commit is contained in:
ReinUsesLisp 2019-06-24 01:56:38 -03:00
parent 4d63f97945
commit b8b05a484a
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -459,7 +459,7 @@ private:
for (const auto& sampler : samplers) { for (const auto& sampler : samplers) {
const std::string name{GetSampler(sampler)}; const std::string name{GetSampler(sampler)};
const std::string description{"layout (binding = SAMPLER_BINDING_" + const std::string description{"layout (binding = SAMPLER_BINDING_" +
std::to_string(sampler.GetIndex()) + ") uniform "}; std::to_string(sampler.GetIndex()) + ") uniform"};
std::string sampler_type = [&]() { std::string sampler_type = [&]() {
switch (sampler.GetType()) { switch (sampler.GetType()) {
case Tegra::Shader::TextureType::Texture1D: case Tegra::Shader::TextureType::Texture1D:
@ -488,13 +488,13 @@ private:
// preprocessor flag and use one or the other from the GPU state. This has to be // preprocessor flag and use one or the other from the GPU state. This has to be
// done because shaders don't have enough information to determine the texture type. // done because shaders don't have enough information to determine the texture type.
EmitIfdefIsBuffer(sampler); EmitIfdefIsBuffer(sampler);
code.AddLine(description + "samplerBuffer " + name + ';'); code.AddLine("{} samplerBuffer {};", description, name);
code.AddLine("#else"); code.AddLine("#else");
code.AddLine(description + sampler_type + ' ' + name + ';'); code.AddLine("{} {} {};", description, sampler_type, name);
code.AddLine("#endif"); code.AddLine("#endif");
} else { } else {
// The other texture types (2D, 3D and cubes) don't have this issue. // The other texture types (2D, 3D and cubes) don't have this issue.
code.AddLine(description + sampler_type + ' ' + name + ';'); code.AddLine("{} {} {};", description, sampler_type, name);
} }
} }
if (!samplers.empty()) { if (!samplers.empty()) {
@ -557,13 +557,14 @@ private:
return "image1D"; return "image1D";
} }
}(); }();
code.AddLine("layout (binding = IMAGE_BINDING_" + std::to_string(image.GetIndex()) + code.AddLine("layout (binding = IMAGE_BINDING_{}) coherent volatile writeonly uniform "
") coherent volatile writeonly uniform " + image_type + ' ' + "{} {};",
GetImage(image) + ';'); image.GetIndex(), image_type, GetImage(image));
} }
if (!images.empty()) if (!images.empty()) {
code.AddNewLine(); code.AddNewLine();
} }
}
void VisitBlock(const NodeBlock& bb) { void VisitBlock(const NodeBlock& bb) {
for (const auto& node : bb) { for (const auto& node : bb) {
@ -1504,9 +1505,9 @@ private:
const std::string tmp{code.GenerateTemporary()}; const std::string tmp{code.GenerateTemporary()};
EmitIfdefIsBuffer(meta->sampler); EmitIfdefIsBuffer(meta->sampler);
code.AddLine("float " + tmp + " = " + expr_buffer + ';'); code.AddLine("float {} = {};", tmp, expr_buffer);
code.AddLine("#else"); code.AddLine("#else");
code.AddLine("float " + tmp + " = " + expr + ';'); code.AddLine("float {} = {};", tmp, expr);
code.AddLine("#endif"); code.AddLine("#endif");
return tmp; return tmp;
@ -1860,7 +1861,7 @@ private:
} }
void EmitIfdefIsBuffer(const Sampler& sampler) { void EmitIfdefIsBuffer(const Sampler& sampler) {
code.AddLine(fmt::format("#ifdef SAMPLER_{}_IS_BUFFER", sampler.GetIndex())); code.AddLine("#ifdef SAMPLER_{}_IS_BUFFER", sampler.GetIndex());
} }
std::string GetDeclarationWithSuffix(u32 index, const std::string& name) const { std::string GetDeclarationWithSuffix(u32 index, const std::string& name) const {