yuzu-emu
/
yuzu-mainline
Archived
1
0
Fork 0
Code

glsl: Fix precise variable declaration 

and add some more separation in the shader for better debugability when dumped
This commit is contained in:
ameerj 2021-06-01 00:07:14 -04:00
parent 8c684b3e23
commit 59576b82a8
3 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/shader_recompiler/backend/glsl/emit_context.cpp
View File

@ -150,7 +150,7 @@ void SetupOutPerVertex(Stage stage, const Info& info, std::string& header) {
if (info.stores_clip_distance) { if (info.stores_clip_distance) {
header += "float gl_ClipDistance[];"; header += "float gl_ClipDistance[];";
} }
header += "};"; header += "};\n";
} }
} // namespace } // namespace
@ -223,6 +223,7 @@ EmitContext::EmitContext(IR::Program& program, Bindings& bindings, const Profile
header += declaration; header += declaration;
} }
} }
header += "\n";
DefineConstantBuffers(bindings); DefineConstantBuffers(bindings);
DefineStorageBuffers(bindings); DefineStorageBuffers(bindings);
SetupImages(bindings); SetupImages(bindings);

12
src/shader_recompiler/backend/glsl/emit_glsl.cpp
View File

@ -180,13 +180,15 @@ void DefineVariables(const EmitContext& ctx, std::string& header) {
const auto type{static_cast<GlslVarType>(i)}; const auto type{static_cast<GlslVarType>(i)};
const auto& tracker{ctx.var_alloc.GetUseTracker(type)}; const auto& tracker{ctx.var_alloc.GetUseTracker(type)};
const auto type_name{ctx.var_alloc.GetGlslType(type)}; const auto type_name{ctx.var_alloc.GetGlslType(type)};
const auto precise{
(type == GlslVarType::PrecF32 || type == GlslVarType::PrecF64) ? "precise " : ""};
// Temps/return types that are never used are stored at index 0 // Temps/return types that are never used are stored at index 0
if (tracker.uses_temp) { if (tracker.uses_temp) {
header += fmt::format("{}{}={}(0);", type_name, ctx.var_alloc.Representation(0, type), header += fmt::format("{}{} {}={}(0);", precise, type_name,
type_name); ctx.var_alloc.Representation(0, type), type_name);
} }
for (u32 index = 1; index <= tracker.num_used; ++index) { for (u32 index = 1; index <= tracker.num_used; ++index) {
header += fmt::format("{}{}={}(0);", type_name, header += fmt::format("{}{} {}={}(0);", precise, type_name,
ctx.var_alloc.Representation(index, type), type_name); ctx.var_alloc.Representation(index, type), type_name);
} }
} }
@ -198,7 +200,7 @@ std::string EmitGLSL(const Profile& profile, const RuntimeInfo& runtime_info, IR
EmitContext ctx{program, bindings, profile, runtime_info}; EmitContext ctx{program, bindings, profile, runtime_info};
Precolor(program); Precolor(program);
EmitCode(ctx, program); EmitCode(ctx, program);
const std::string version{fmt::format("#version 450{}\n", GlslVersionSpecifier(ctx))}; const std::string version{fmt::format("#version 460{}\n", GlslVersionSpecifier(ctx))};
ctx.header.insert(0, version); ctx.header.insert(0, version);
if (program.local_memory_size > 0) { if (program.local_memory_size > 0) {
ctx.header += fmt::format("uint lmem[{}];", program.local_memory_size / 4); ctx.header += fmt::format("uint lmem[{}];", program.local_memory_size / 4);
@ -206,7 +208,7 @@ std::string EmitGLSL(const Profile& profile, const RuntimeInfo& runtime_info, IR
if (program.shared_memory_size > 0) { if (program.shared_memory_size > 0) {
ctx.header += fmt::format("shared uint smem[{}];", program.shared_memory_size / 4); ctx.header += fmt::format("shared uint smem[{}];", program.shared_memory_size / 4);
} }
ctx.header += "void main(){\n"; ctx.header += "\nvoid main(){\n";
if (program.stage == Stage::VertexA || program.stage == Stage::VertexB) { if (program.stage == Stage::VertexA || program.stage == Stage::VertexB) {
ctx.header += "gl_Position = vec4(0.0f, 0.0f, 0.0f, 1.0f);"; ctx.header += "gl_Position = vec4(0.0f, 0.0f, 0.0f, 1.0f);";
// TODO: Properly resolve attribute issues // TODO: Properly resolve attribute issues

6
src/shader_recompiler/backend/glsl/var_alloc.cpp
View File

@ -210,12 +210,14 @@ std::string VarAlloc::GetGlslType(GlslVarType type) const {
case GlslVarType::S32: case GlslVarType::S32:
return "int"; return "int";
case GlslVarType::F32: case GlslVarType::F32:
case GlslVarType::PrecF32:
return "float"; return "float";
case GlslVarType::S64: case GlslVarType::S64:
return "int64_t"; return "int64_t";
case GlslVarType::U64: case GlslVarType::U64:
return "uint64_t"; return "uint64_t";
case GlslVarType::F64: case GlslVarType::F64:
case GlslVarType::PrecF64:
return "double"; return "double";
case GlslVarType::U32x2: case GlslVarType::U32x2:
return "uvec2"; return "uvec2";
@ -229,10 +231,6 @@ std::string VarAlloc::GetGlslType(GlslVarType type) const {
return "uvec4"; return "uvec4";
case GlslVarType::F32x4: case GlslVarType::F32x4:
return "vec4"; return "vec4";
case GlslVarType::PrecF32:
return "precise float ";
case GlslVarType::PrecF64:
return "precise double ";
case GlslVarType::Void: case GlslVarType::Void:
return ""; return "";
default: default: