diff options
Diffstat (limited to 'src/shader_recompiler/backend/glasm')
| -rw-r--r-- | src/shader_recompiler/backend/glasm/emit_glasm.cpp | 16 | ||||
| -rw-r--r-- | src/shader_recompiler/backend/glasm/emit_glasm_image.cpp | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/shader_recompiler/backend/glasm/emit_glasm.cpp b/src/shader_recompiler/backend/glasm/emit_glasm.cpp index e5c96eb7f..0a76423f4 100644 --- a/src/shader_recompiler/backend/glasm/emit_glasm.cpp +++ b/src/shader_recompiler/backend/glasm/emit_glasm.cpp | |||
| @@ -212,14 +212,14 @@ void EmitCode(EmitContext& ctx, const IR::Program& program) { | |||
| 212 | for (const IR::AbstractSyntaxNode& node : program.syntax_list) { | 212 | for (const IR::AbstractSyntaxNode& node : program.syntax_list) { |
| 213 | switch (node.type) { | 213 | switch (node.type) { |
| 214 | case IR::AbstractSyntaxNode::Type::Block: | 214 | case IR::AbstractSyntaxNode::Type::Block: |
| 215 | for (IR::Inst& inst : node.block->Instructions()) { | 215 | for (IR::Inst& inst : node.data.block->Instructions()) { |
| 216 | EmitInst(ctx, &inst); | 216 | EmitInst(ctx, &inst); |
| 217 | } | 217 | } |
| 218 | break; | 218 | break; |
| 219 | case IR::AbstractSyntaxNode::Type::If: | 219 | case IR::AbstractSyntaxNode::Type::If: |
| 220 | ctx.Add("MOV.S.CC RC,{};" | 220 | ctx.Add("MOV.S.CC RC,{};" |
| 221 | "IF NE.x;", | 221 | "IF NE.x;", |
| 222 | eval(node.if_node.cond)); | 222 | eval(node.data.if_node.cond)); |
| 223 | break; | 223 | break; |
| 224 | case IR::AbstractSyntaxNode::Type::EndIf: | 224 | case IR::AbstractSyntaxNode::Type::EndIf: |
| 225 | ctx.Add("ENDIF;"); | 225 | ctx.Add("ENDIF;"); |
| @@ -228,8 +228,8 @@ void EmitCode(EmitContext& ctx, const IR::Program& program) { | |||
| 228 | ctx.Add("REP;"); | 228 | ctx.Add("REP;"); |
| 229 | break; | 229 | break; |
| 230 | case IR::AbstractSyntaxNode::Type::Repeat: | 230 | case IR::AbstractSyntaxNode::Type::Repeat: |
| 231 | if (node.repeat.cond.IsImmediate()) { | 231 | if (node.data.repeat.cond.IsImmediate()) { |
| 232 | if (node.repeat.cond.U1()) { | 232 | if (node.data.repeat.cond.U1()) { |
| 233 | ctx.Add("ENDREP;"); | 233 | ctx.Add("ENDREP;"); |
| 234 | } else { | 234 | } else { |
| 235 | ctx.Add("BRK;" | 235 | ctx.Add("BRK;" |
| @@ -239,18 +239,18 @@ void EmitCode(EmitContext& ctx, const IR::Program& program) { | |||
| 239 | ctx.Add("MOV.S.CC RC,{};" | 239 | ctx.Add("MOV.S.CC RC,{};" |
| 240 | "BRK (EQ.x);" | 240 | "BRK (EQ.x);" |
| 241 | "ENDREP;", | 241 | "ENDREP;", |
| 242 | eval(node.repeat.cond)); | 242 | eval(node.data.repeat.cond)); |
| 243 | } | 243 | } |
| 244 | break; | 244 | break; |
| 245 | case IR::AbstractSyntaxNode::Type::Break: | 245 | case IR::AbstractSyntaxNode::Type::Break: |
| 246 | if (node.break_node.cond.IsImmediate()) { | 246 | if (node.data.break_node.cond.IsImmediate()) { |
| 247 | if (node.break_node.cond.U1()) { | 247 | if (node.data.break_node.cond.U1()) { |
| 248 | ctx.Add("BRK;"); | 248 | ctx.Add("BRK;"); |
| 249 | } | 249 | } |
| 250 | } else { | 250 | } else { |
| 251 | ctx.Add("MOV.S.CC RC,{};" | 251 | ctx.Add("MOV.S.CC RC,{};" |
| 252 | "BRK (NE.x);", | 252 | "BRK (NE.x);", |
| 253 | eval(node.break_node.cond)); | 253 | eval(node.data.break_node.cond)); |
| 254 | } | 254 | } |
| 255 | break; | 255 | break; |
| 256 | case IR::AbstractSyntaxNode::Type::Return: | 256 | case IR::AbstractSyntaxNode::Type::Return: |
diff --git a/src/shader_recompiler/backend/glasm/emit_glasm_image.cpp b/src/shader_recompiler/backend/glasm/emit_glasm_image.cpp index a32d01925..4d146d34e 100644 --- a/src/shader_recompiler/backend/glasm/emit_glasm_image.cpp +++ b/src/shader_recompiler/backend/glasm/emit_glasm_image.cpp | |||
| @@ -105,7 +105,7 @@ void EmitBoundImageWrite(EmitContext&) { | |||
| 105 | throw LogicError("Unreachable instruction"); | 105 | throw LogicError("Unreachable instruction"); |
| 106 | } | 106 | } |
| 107 | 107 | ||
| 108 | std::string Texture([[maybe_unused]] EmitContext& ctx, IR::TextureInstInfo info, | 108 | static std::string Texture([[maybe_unused]] EmitContext& ctx, IR::TextureInstInfo info, |
| 109 | [[maybe_unused]] const IR::Value& index) { | 109 | [[maybe_unused]] const IR::Value& index) { |
| 110 | // FIXME | 110 | // FIXME |
| 111 | return fmt::format("texture[{}]", info.descriptor_index); | 111 | return fmt::format("texture[{}]", info.descriptor_index); |