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

glsl: Move gl_Position/generic attribute initialization to EmitProlgue

Browse Source
This commit is contained in:
ameerj
2021-06-15 00:30:59 -04:00
parent 3b339fbbf6
commit c5dfa0b630
2 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -216,15 +216,6 @@ std::string EmitGLSL(const Profile& profile, const RuntimeInfo& runtime_info, IR
fmt::format("shared uint smem[{}];", Common::AlignUp(program.shared_memory_size, 4)); fmt::format("shared uint smem[{}];", Common::AlignUp(program.shared_memory_size, 4));
} }
ctx.header += "void main(){\n"; ctx.header += "void main(){\n";
if (program.stage == Stage::VertexA || program.stage == Stage::VertexB) {
ctx.header += "gl_Position = vec4(0.0f, 0.0f, 0.0f, 1.0f);";
// TODO: Properly resolve attribute issues
for (size_t index = 0; index < program.info.stores_generics.size() / 2; ++index) {
if (!program.info.stores_generics[index]) {
ctx.header += fmt::format("out_attr{}=vec4(0,0,0,1);", index);
}
}
}
DefineVariables(ctx, ctx.header); DefineVariables(ctx, ctx.header);
if (ctx.uses_cc_carry) { if (ctx.uses_cc_carry) {
ctx.header += "uint carry;"; ctx.header += "uint carry;";

17
src/shader_recompiler/backend/glsl/emit_glsl_special.cpp
View File

@@ -6,6 +6,7 @@
#include "shader_recompiler/backend/glsl/emit_context.h" #include "shader_recompiler/backend/glsl/emit_context.h"
#include "shader_recompiler/backend/glsl/emit_glsl_instructions.h" #include "shader_recompiler/backend/glsl/emit_glsl_instructions.h"
#include "shader_recompiler/frontend/ir/program.h"
#include "shader_recompiler/frontend/ir/value.h" #include "shader_recompiler/frontend/ir/value.h"
namespace Shader::Backend::GLSL { namespace Shader::Backend::GLSL {
@@ -42,13 +43,19 @@ void EmitPhiMove(EmitContext& ctx, const IR::Value& phi_value, const IR::Value&
ctx.Add("{}={};", phi_reg, val_reg); ctx.Add("{}={};", phi_reg, val_reg);
} }
void EmitPrologue(EmitContext&) { void EmitPrologue(EmitContext& ctx) {
// TODO if (ctx.stage == Stage::VertexA || ctx.stage == Stage::VertexB) {
ctx.Add("gl_Position=vec4(0.0f, 0.0f, 0.0f, 1.0f);");
// TODO: Properly resolve attribute issues
for (size_t index = 0; index < ctx.info.stores_generics.size() / 2; ++index) {
if (!ctx.info.stores_generics[index]) {
ctx.Add("out_attr{}=vec4(0,0,0,1);", index);
}
}
}
} }
void EmitEpilogue(EmitContext&) { void EmitEpilogue(EmitContext&) {}
// TODO
}
void EmitEmitVertex(EmitContext& ctx, const IR::Value& stream) { void EmitEmitVertex(EmitContext& ctx, const IR::Value& stream) {
ctx.Add("EmitStreamVertex(int({}));", ctx.var_alloc.Consume(stream)); ctx.Add("EmitStreamVertex(int({}));", ctx.var_alloc.Consume(stream));