summaryrefslogtreecommitdiff
path: root/src/shader_recompiler
diff options
context:
space:
mode:
Diffstat (limited to 'src/shader_recompiler')
-rw-r--r--src/shader_recompiler/CMakeLists.txt1
-rw-r--r--src/shader_recompiler/backend/glasm/emit_glasm.cpp3
-rw-r--r--src/shader_recompiler/backend/glasm/emit_glasm_context_get_set.cpp4
-rw-r--r--src/shader_recompiler/backend/glasm/emit_glasm_instructions.h1
-rw-r--r--src/shader_recompiler/backend/glsl/emit_glsl_context_get_set.cpp4
-rw-r--r--src/shader_recompiler/backend/glsl/emit_glsl_instructions.h1
-rw-r--r--src/shader_recompiler/backend/glsl/glsl_emit_context.cpp3
-rw-r--r--src/shader_recompiler/backend/spirv/emit_spirv.h4
-rw-r--r--src/shader_recompiler/backend/spirv/emit_spirv_context_get_set.cpp12
-rw-r--r--src/shader_recompiler/backend/spirv/emit_spirv_instructions.h1
-rw-r--r--src/shader_recompiler/backend/spirv/spirv_emit_context.cpp31
-rw-r--r--src/shader_recompiler/backend/spirv/spirv_emit_context.h4
-rw-r--r--src/shader_recompiler/environment.h2
-rw-r--r--src/shader_recompiler/frontend/ir/ir_emitter.cpp8
-rw-r--r--src/shader_recompiler/frontend/ir/ir_emitter.h3
-rw-r--r--src/shader_recompiler/frontend/ir/opcodes.inc1
-rw-r--r--src/shader_recompiler/frontend/maxwell/translate_program.cpp2
-rw-r--r--src/shader_recompiler/ir_opt/passes.h1
-rw-r--r--src/shader_recompiler/ir_opt/position_pass.cpp77
-rw-r--r--src/shader_recompiler/shader_info.h1
20 files changed, 163 insertions, 1 deletions
diff --git a/src/shader_recompiler/CMakeLists.txt b/src/shader_recompiler/CMakeLists.txt
index af8e51fe8..189e5cb17 100644
--- a/src/shader_recompiler/CMakeLists.txt
+++ b/src/shader_recompiler/CMakeLists.txt
@@ -224,6 +224,7 @@ add_library(shader_recompiler STATIC
224 ir_opt/lower_fp16_to_fp32.cpp 224 ir_opt/lower_fp16_to_fp32.cpp
225 ir_opt/lower_int64_to_int32.cpp 225 ir_opt/lower_int64_to_int32.cpp
226 ir_opt/passes.h 226 ir_opt/passes.h
227 ir_opt/position_pass.cpp
227 ir_opt/rescaling_pass.cpp 228 ir_opt/rescaling_pass.cpp
228 ir_opt/ssa_rewrite_pass.cpp 229 ir_opt/ssa_rewrite_pass.cpp
229 ir_opt/texture_pass.cpp 230 ir_opt/texture_pass.cpp
diff --git a/src/shader_recompiler/backend/glasm/emit_glasm.cpp b/src/shader_recompiler/backend/glasm/emit_glasm.cpp
index 97a6b383b..1419207e8 100644
--- a/src/shader_recompiler/backend/glasm/emit_glasm.cpp
+++ b/src/shader_recompiler/backend/glasm/emit_glasm.cpp
@@ -450,6 +450,9 @@ std::string EmitGLASM(const Profile& profile, const RuntimeInfo& runtime_info, I
450 if (program.info.uses_rescaling_uniform) { 450 if (program.info.uses_rescaling_uniform) {
451 header += "PARAM scaling[1]={program.local[0..0]};"; 451 header += "PARAM scaling[1]={program.local[0..0]};";
452 } 452 }
453 if (program.info.uses_render_area) {
454 header += "PARAM render_area[1]={program.local[1..1]};";
455 }
453 header += "TEMP "; 456 header += "TEMP ";
454 for (size_t index = 0; index < ctx.reg_alloc.NumUsedRegisters(); ++index) { 457 for (size_t index = 0; index < ctx.reg_alloc.NumUsedRegisters(); ++index) {
455 header += fmt::format("R{},", index); 458 header += fmt::format("R{},", index);
diff --git a/src/shader_recompiler/backend/glasm/emit_glasm_context_get_set.cpp b/src/shader_recompiler/backend/glasm/emit_glasm_context_get_set.cpp
index b5c08d611..ee0b0f53d 100644
--- a/src/shader_recompiler/backend/glasm/emit_glasm_context_get_set.cpp
+++ b/src/shader_recompiler/backend/glasm/emit_glasm_context_get_set.cpp
@@ -379,6 +379,10 @@ void EmitResolutionDownFactor(EmitContext& ctx, IR::Inst& inst) {
379 ctx.Add("MOV.F {}.x,scaling[0].z;", inst); 379 ctx.Add("MOV.F {}.x,scaling[0].z;", inst);
380} 380}
381 381
382void EmitRenderArea(EmitContext& ctx, IR::Inst& inst) {
383 ctx.Add("MOV.F {},render_area[0];", inst);
384}
385
382void EmitLoadLocal(EmitContext& ctx, IR::Inst& inst, ScalarU32 word_offset) { 386void EmitLoadLocal(EmitContext& ctx, IR::Inst& inst, ScalarU32 word_offset) {
383 ctx.Add("MOV.U {},lmem[{}].x;", inst, word_offset); 387 ctx.Add("MOV.U {},lmem[{}].x;", inst, word_offset);
384} 388}
diff --git a/src/shader_recompiler/backend/glasm/emit_glasm_instructions.h b/src/shader_recompiler/backend/glasm/emit_glasm_instructions.h
index 8b0ac3031..c08f48ed9 100644
--- a/src/shader_recompiler/backend/glasm/emit_glasm_instructions.h
+++ b/src/shader_recompiler/backend/glasm/emit_glasm_instructions.h
@@ -73,6 +73,7 @@ void EmitSampleId(EmitContext& ctx, IR::Inst& inst);
73void EmitIsHelperInvocation(EmitContext& ctx, IR::Inst& inst); 73void EmitIsHelperInvocation(EmitContext& ctx, IR::Inst& inst);
74void EmitYDirection(EmitContext& ctx, IR::Inst& inst); 74void EmitYDirection(EmitContext& ctx, IR::Inst& inst);
75void EmitResolutionDownFactor(EmitContext& ctx, IR::Inst& inst); 75void EmitResolutionDownFactor(EmitContext& ctx, IR::Inst& inst);
76void EmitRenderArea(EmitContext& ctx, IR::Inst& inst);
76void EmitLoadLocal(EmitContext& ctx, IR::Inst& inst, ScalarU32 word_offset); 77void EmitLoadLocal(EmitContext& ctx, IR::Inst& inst, ScalarU32 word_offset);
77void EmitWriteLocal(EmitContext& ctx, ScalarU32 word_offset, ScalarU32 value); 78void EmitWriteLocal(EmitContext& ctx, ScalarU32 word_offset, ScalarU32 value);
78void EmitUndefU1(EmitContext& ctx, IR::Inst& inst); 79void EmitUndefU1(EmitContext& ctx, IR::Inst& inst);
diff --git a/src/shader_recompiler/backend/glsl/emit_glsl_context_get_set.cpp b/src/shader_recompiler/backend/glsl/emit_glsl_context_get_set.cpp
index fad8d1e30..d7c845469 100644
--- a/src/shader_recompiler/backend/glsl/emit_glsl_context_get_set.cpp
+++ b/src/shader_recompiler/backend/glsl/emit_glsl_context_get_set.cpp
@@ -416,6 +416,10 @@ void EmitResolutionDownFactor(EmitContext& ctx, IR::Inst& inst) {
416 ctx.AddF32("{}=scaling.z;", inst); 416 ctx.AddF32("{}=scaling.z;", inst);
417} 417}
418 418
419void EmitRenderArea(EmitContext& ctx, IR::Inst& inst) {
420 ctx.AddF32x4("{}=render_area;", inst);
421}
422
419void EmitLoadLocal(EmitContext& ctx, IR::Inst& inst, std::string_view word_offset) { 423void EmitLoadLocal(EmitContext& ctx, IR::Inst& inst, std::string_view word_offset) {
420 ctx.AddU32("{}=lmem[{}];", inst, word_offset); 424 ctx.AddU32("{}=lmem[{}];", inst, word_offset);
421} 425}
diff --git a/src/shader_recompiler/backend/glsl/emit_glsl_instructions.h b/src/shader_recompiler/backend/glsl/emit_glsl_instructions.h
index 639691ba6..3c8bcb7e9 100644
--- a/src/shader_recompiler/backend/glsl/emit_glsl_instructions.h
+++ b/src/shader_recompiler/backend/glsl/emit_glsl_instructions.h
@@ -87,6 +87,7 @@ void EmitSampleId(EmitContext& ctx, IR::Inst& inst);
87void EmitIsHelperInvocation(EmitContext& ctx, IR::Inst& inst); 87void EmitIsHelperInvocation(EmitContext& ctx, IR::Inst& inst);
88void EmitYDirection(EmitContext& ctx, IR::Inst& inst); 88void EmitYDirection(EmitContext& ctx, IR::Inst& inst);
89void EmitResolutionDownFactor(EmitContext& ctx, IR::Inst& inst); 89void EmitResolutionDownFactor(EmitContext& ctx, IR::Inst& inst);
90void EmitRenderArea(EmitContext& ctx, IR::Inst& inst);
90void EmitLoadLocal(EmitContext& ctx, IR::Inst& inst, std::string_view word_offset); 91void EmitLoadLocal(EmitContext& ctx, IR::Inst& inst, std::string_view word_offset);
91void EmitWriteLocal(EmitContext& ctx, std::string_view word_offset, std::string_view value); 92void EmitWriteLocal(EmitContext& ctx, std::string_view word_offset, std::string_view value);
92void EmitUndefU1(EmitContext& ctx, IR::Inst& inst); 93void EmitUndefU1(EmitContext& ctx, IR::Inst& inst);
diff --git a/src/shader_recompiler/backend/glsl/glsl_emit_context.cpp b/src/shader_recompiler/backend/glsl/glsl_emit_context.cpp
index c767a9dc3..5d01ec0cd 100644
--- a/src/shader_recompiler/backend/glsl/glsl_emit_context.cpp
+++ b/src/shader_recompiler/backend/glsl/glsl_emit_context.cpp
@@ -358,6 +358,9 @@ EmitContext::EmitContext(IR::Program& program, Bindings& bindings, const Profile
358 if (info.uses_rescaling_uniform) { 358 if (info.uses_rescaling_uniform) {
359 header += "layout(location=0) uniform vec4 scaling;"; 359 header += "layout(location=0) uniform vec4 scaling;";
360 } 360 }
361 if (info.uses_render_area) {
362 header += "layout(location=1) uniform vec4 render_area;";
363 }
361 DefineConstantBuffers(bindings); 364 DefineConstantBuffers(bindings);
362 DefineConstantBufferIndirect(); 365 DefineConstantBufferIndirect();
363 DefineStorageBuffers(bindings); 366 DefineStorageBuffers(bindings);
diff --git a/src/shader_recompiler/backend/spirv/emit_spirv.h b/src/shader_recompiler/backend/spirv/emit_spirv.h
index 7567b6fc9..937881484 100644
--- a/src/shader_recompiler/backend/spirv/emit_spirv.h
+++ b/src/shader_recompiler/backend/spirv/emit_spirv.h
@@ -23,8 +23,12 @@ struct RescalingLayout {
23 alignas(16) std::array<u32, NUM_IMAGE_SCALING_WORDS> rescaling_images; 23 alignas(16) std::array<u32, NUM_IMAGE_SCALING_WORDS> rescaling_images;
24 u32 down_factor; 24 u32 down_factor;
25}; 25};
26struct RenderAreaLayout {
27 std::array<f32, 4> render_area;
28};
26constexpr u32 RESCALING_LAYOUT_WORDS_OFFSET = offsetof(RescalingLayout, rescaling_textures); 29constexpr u32 RESCALING_LAYOUT_WORDS_OFFSET = offsetof(RescalingLayout, rescaling_textures);
27constexpr u32 RESCALING_LAYOUT_DOWN_FACTOR_OFFSET = offsetof(RescalingLayout, down_factor); 30constexpr u32 RESCALING_LAYOUT_DOWN_FACTOR_OFFSET = offsetof(RescalingLayout, down_factor);
31constexpr u32 RENDERAREA_LAYOUT_OFFSET = offsetof(RenderAreaLayout, render_area);
28 32
29[[nodiscard]] std::vector<u32> EmitSPIRV(const Profile& profile, const RuntimeInfo& runtime_info, 33[[nodiscard]] std::vector<u32> EmitSPIRV(const Profile& profile, const RuntimeInfo& runtime_info,
30 IR::Program& program, Bindings& bindings); 34 IR::Program& program, Bindings& bindings);
diff --git a/src/shader_recompiler/backend/spirv/emit_spirv_context_get_set.cpp b/src/shader_recompiler/backend/spirv/emit_spirv_context_get_set.cpp
index 2c68aba39..a4751b42d 100644
--- a/src/shader_recompiler/backend/spirv/emit_spirv_context_get_set.cpp
+++ b/src/shader_recompiler/backend/spirv/emit_spirv_context_get_set.cpp
@@ -353,7 +353,6 @@ Id EmitGetAttribute(EmitContext& ctx, IR::Attribute attr, Id vertex) {
353 case IR::Attribute::TessellationEvaluationPointV: 353 case IR::Attribute::TessellationEvaluationPointV:
354 return ctx.OpLoad(ctx.F32[1], 354 return ctx.OpLoad(ctx.F32[1],
355 ctx.OpAccessChain(ctx.input_f32, ctx.tess_coord, ctx.Const(1U))); 355 ctx.OpAccessChain(ctx.input_f32, ctx.tess_coord, ctx.Const(1U)));
356
357 default: 356 default:
358 throw NotImplementedException("Read attribute {}", attr); 357 throw NotImplementedException("Read attribute {}", attr);
359 } 358 }
@@ -537,6 +536,17 @@ Id EmitResolutionDownFactor(EmitContext& ctx) {
537 } 536 }
538} 537}
539 538
539Id EmitRenderArea(EmitContext& ctx) {
540 if (ctx.profile.unified_descriptor_binding) {
541 const Id pointer_type{ctx.TypePointer(spv::StorageClass::PushConstant, ctx.F32[4])};
542 const Id index{ctx.Const(ctx.render_are_member_index)};
543 const Id pointer{ctx.OpAccessChain(pointer_type, ctx.render_area_push_constant, index)};
544 return ctx.OpLoad(ctx.F32[4], pointer);
545 } else {
546 throw NotImplementedException("SPIR-V Instruction");
547 }
548}
549
540Id EmitLoadLocal(EmitContext& ctx, Id word_offset) { 550Id EmitLoadLocal(EmitContext& ctx, Id word_offset) {
541 const Id pointer{ctx.OpAccessChain(ctx.private_u32, ctx.local_memory, word_offset)}; 551 const Id pointer{ctx.OpAccessChain(ctx.private_u32, ctx.local_memory, word_offset)};
542 return ctx.OpLoad(ctx.U32[1], pointer); 552 return ctx.OpLoad(ctx.U32[1], pointer);
diff --git a/src/shader_recompiler/backend/spirv/emit_spirv_instructions.h b/src/shader_recompiler/backend/spirv/emit_spirv_instructions.h
index 984d072b4..86dd3c4f3 100644
--- a/src/shader_recompiler/backend/spirv/emit_spirv_instructions.h
+++ b/src/shader_recompiler/backend/spirv/emit_spirv_instructions.h
@@ -76,6 +76,7 @@ Id EmitSampleId(EmitContext& ctx);
76Id EmitIsHelperInvocation(EmitContext& ctx); 76Id EmitIsHelperInvocation(EmitContext& ctx);
77Id EmitYDirection(EmitContext& ctx); 77Id EmitYDirection(EmitContext& ctx);
78Id EmitResolutionDownFactor(EmitContext& ctx); 78Id EmitResolutionDownFactor(EmitContext& ctx);
79Id EmitRenderArea(EmitContext& ctx);
79Id EmitLoadLocal(EmitContext& ctx, Id word_offset); 80Id EmitLoadLocal(EmitContext& ctx, Id word_offset);
80void EmitWriteLocal(EmitContext& ctx, Id word_offset, Id value); 81void EmitWriteLocal(EmitContext& ctx, Id word_offset, Id value);
81Id EmitUndefU1(EmitContext& ctx); 82Id EmitUndefU1(EmitContext& ctx);
diff --git a/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp b/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp
index aecc4c612..c26ad8f93 100644
--- a/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp
+++ b/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp
@@ -473,6 +473,7 @@ EmitContext::EmitContext(const Profile& profile_, const RuntimeInfo& runtime_inf
473 DefineAttributeMemAccess(program.info); 473 DefineAttributeMemAccess(program.info);
474 DefineGlobalMemoryFunctions(program.info); 474 DefineGlobalMemoryFunctions(program.info);
475 DefineRescalingInput(program.info); 475 DefineRescalingInput(program.info);
476 DefineRenderArea(program.info);
476} 477}
477 478
478EmitContext::~EmitContext() = default; 479EmitContext::~EmitContext() = default;
@@ -982,6 +983,36 @@ void EmitContext::DefineRescalingInputUniformConstant() {
982 } 983 }
983} 984}
984 985
986void EmitContext::DefineRenderArea(const Info& info) {
987 if (!info.uses_render_area) {
988 return;
989 }
990
991 if (profile.unified_descriptor_binding) {
992 boost::container::static_vector<Id, 1> members{};
993 u32 member_index{0};
994
995 members.push_back(F32[4]);
996 render_are_member_index = member_index++;
997
998 const Id push_constant_struct{TypeStruct(std::span(members.data(), members.size()))};
999 Decorate(push_constant_struct, spv::Decoration::Block);
1000 Name(push_constant_struct, "RenderAreaInfo");
1001
1002 MemberDecorate(push_constant_struct, render_are_member_index, spv::Decoration::Offset, 0);
1003 MemberName(push_constant_struct, render_are_member_index, "render_area");
1004
1005 const Id pointer_type{TypePointer(spv::StorageClass::PushConstant, push_constant_struct)};
1006 render_area_push_constant =
1007 AddGlobalVariable(pointer_type, spv::StorageClass::PushConstant);
1008 Name(render_area_push_constant, "render_area_push_constants");
1009
1010 if (profile.supported_spirv >= 0x00010400) {
1011 interfaces.push_back(render_area_push_constant);
1012 }
1013 }
1014}
1015
985void EmitContext::DefineConstantBuffers(const Info& info, u32& binding) { 1016void EmitContext::DefineConstantBuffers(const Info& info, u32& binding) {
986 if (info.constant_buffer_descriptors.empty()) { 1017 if (info.constant_buffer_descriptors.empty()) {
987 return; 1018 return;
diff --git a/src/shader_recompiler/backend/spirv/spirv_emit_context.h b/src/shader_recompiler/backend/spirv/spirv_emit_context.h
index bc25b8b84..c86e50911 100644
--- a/src/shader_recompiler/backend/spirv/spirv_emit_context.h
+++ b/src/shader_recompiler/backend/spirv/spirv_emit_context.h
@@ -243,6 +243,9 @@ public:
243 u32 texture_rescaling_index{}; 243 u32 texture_rescaling_index{};
244 u32 image_rescaling_index{}; 244 u32 image_rescaling_index{};
245 245
246 Id render_area_push_constant{};
247 u32 render_are_member_index{};
248
246 Id local_memory{}; 249 Id local_memory{};
247 250
248 Id shared_memory_u8{}; 251 Id shared_memory_u8{};
@@ -318,6 +321,7 @@ private:
318 void DefineRescalingInput(const Info& info); 321 void DefineRescalingInput(const Info& info);
319 void DefineRescalingInputPushConstant(); 322 void DefineRescalingInputPushConstant();
320 void DefineRescalingInputUniformConstant(); 323 void DefineRescalingInputUniformConstant();
324 void DefineRenderArea(const Info& info);
321 325
322 void DefineInputs(const IR::Program& program); 326 void DefineInputs(const IR::Program& program);
323 void DefineOutputs(const IR::Program& program); 327 void DefineOutputs(const IR::Program& program);
diff --git a/src/shader_recompiler/environment.h b/src/shader_recompiler/environment.h
index 9729d48c6..980e0e54c 100644
--- a/src/shader_recompiler/environment.h
+++ b/src/shader_recompiler/environment.h
@@ -22,6 +22,8 @@ public:
22 22
23 [[nodiscard]] virtual TextureType ReadTextureType(u32 raw_handle) = 0; 23 [[nodiscard]] virtual TextureType ReadTextureType(u32 raw_handle) = 0;
24 24
25 [[nodiscard]] virtual u32 ReadViewportTransformState() = 0;
26
25 [[nodiscard]] virtual u32 TextureBoundBuffer() const = 0; 27 [[nodiscard]] virtual u32 TextureBoundBuffer() const = 0;
26 28
27 [[nodiscard]] virtual u32 LocalMemorySize() const = 0; 29 [[nodiscard]] virtual u32 LocalMemorySize() const = 0;
diff --git a/src/shader_recompiler/frontend/ir/ir_emitter.cpp b/src/shader_recompiler/frontend/ir/ir_emitter.cpp
index 11086ed8c..de1ce90a3 100644
--- a/src/shader_recompiler/frontend/ir/ir_emitter.cpp
+++ b/src/shader_recompiler/frontend/ir/ir_emitter.cpp
@@ -378,6 +378,14 @@ F32 IREmitter::ResolutionDownFactor() {
378 return Inst<F32>(Opcode::ResolutionDownFactor); 378 return Inst<F32>(Opcode::ResolutionDownFactor);
379} 379}
380 380
381F32 IREmitter::RenderAreaWidth() {
382 return F32(CompositeExtract(Inst<Value>(Opcode::RenderArea), 0));
383}
384
385F32 IREmitter::RenderAreaHeight() {
386 return F32(CompositeExtract(Inst<Value>(Opcode::RenderArea), 1));
387}
388
381U32 IREmitter::LaneId() { 389U32 IREmitter::LaneId() {
382 return Inst<U32>(Opcode::LaneId); 390 return Inst<U32>(Opcode::LaneId);
383} 391}
diff --git a/src/shader_recompiler/frontend/ir/ir_emitter.h b/src/shader_recompiler/frontend/ir/ir_emitter.h
index 25839a371..f163c18d9 100644
--- a/src/shader_recompiler/frontend/ir/ir_emitter.h
+++ b/src/shader_recompiler/frontend/ir/ir_emitter.h
@@ -103,6 +103,9 @@ public:
103 103
104 [[nodiscard]] F32 ResolutionDownFactor(); 104 [[nodiscard]] F32 ResolutionDownFactor();
105 105
106 [[nodiscard]] F32 RenderAreaWidth();
107 [[nodiscard]] F32 RenderAreaHeight();
108
106 [[nodiscard]] U32 LaneId(); 109 [[nodiscard]] U32 LaneId();
107 110
108 [[nodiscard]] U32 LoadGlobalU8(const U64& address); 111 [[nodiscard]] U32 LoadGlobalU8(const U64& address);
diff --git a/src/shader_recompiler/frontend/ir/opcodes.inc b/src/shader_recompiler/frontend/ir/opcodes.inc
index 86410ddfc..f3038f298 100644
--- a/src/shader_recompiler/frontend/ir/opcodes.inc
+++ b/src/shader_recompiler/frontend/ir/opcodes.inc
@@ -63,6 +63,7 @@ OPCODE(SampleId, U32,
63OPCODE(IsHelperInvocation, U1, ) 63OPCODE(IsHelperInvocation, U1, )
64OPCODE(YDirection, F32, ) 64OPCODE(YDirection, F32, )
65OPCODE(ResolutionDownFactor, F32, ) 65OPCODE(ResolutionDownFactor, F32, )
66OPCODE(RenderArea, F32x4, )
66 67
67// Undefined 68// Undefined
68OPCODE(UndefU1, U1, ) 69OPCODE(UndefU1, U1, )
diff --git a/src/shader_recompiler/frontend/maxwell/translate_program.cpp b/src/shader_recompiler/frontend/maxwell/translate_program.cpp
index 77efb4f57..dafb9deee 100644
--- a/src/shader_recompiler/frontend/maxwell/translate_program.cpp
+++ b/src/shader_recompiler/frontend/maxwell/translate_program.cpp
@@ -213,6 +213,8 @@ IR::Program TranslateProgram(ObjectPool<IR::Inst>& inst_pool, ObjectPool<IR::Blo
213 213
214 Optimization::ConstantPropagationPass(program); 214 Optimization::ConstantPropagationPass(program);
215 215
216 Optimization::PositionPass(env, program);
217
216 Optimization::GlobalMemoryToStorageBufferPass(program); 218 Optimization::GlobalMemoryToStorageBufferPass(program);
217 Optimization::TexturePass(env, program); 219 Optimization::TexturePass(env, program);
218 220
diff --git a/src/shader_recompiler/ir_opt/passes.h b/src/shader_recompiler/ir_opt/passes.h
index 6ff8e4266..24f609d69 100644
--- a/src/shader_recompiler/ir_opt/passes.h
+++ b/src/shader_recompiler/ir_opt/passes.h
@@ -17,6 +17,7 @@ void LowerFp16ToFp32(IR::Program& program);
17void LowerInt64ToInt32(IR::Program& program); 17void LowerInt64ToInt32(IR::Program& program);
18void RescalingPass(IR::Program& program); 18void RescalingPass(IR::Program& program);
19void SsaRewritePass(IR::Program& program); 19void SsaRewritePass(IR::Program& program);
20void PositionPass(Environment& env, IR::Program& program);
20void TexturePass(Environment& env, IR::Program& program); 21void TexturePass(Environment& env, IR::Program& program);
21void VerificationPass(const IR::Program& program); 22void VerificationPass(const IR::Program& program);
22 23
diff --git a/src/shader_recompiler/ir_opt/position_pass.cpp b/src/shader_recompiler/ir_opt/position_pass.cpp
new file mode 100644
index 000000000..3c20b7189
--- /dev/null
+++ b/src/shader_recompiler/ir_opt/position_pass.cpp
@@ -0,0 +1,77 @@
1// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
2// SPDX-License-Identifier: GPL-2.0-or-later
3
4#include <boost/container/small_vector.hpp>
5
6#include "shader_recompiler/frontend/ir/basic_block.h"
7#include "shader_recompiler/frontend/ir/ir_emitter.h"
8#include "shader_recompiler/frontend/ir/value.h"
9#include "shader_recompiler/ir_opt/passes.h"
10
11namespace Shader::Optimization {
12
13namespace {
14struct PositionInst {
15 IR::Inst* inst;
16 IR::Block* block;
17 IR::Attribute attr;
18};
19using PositionInstVector = boost::container::small_vector<PositionInst, 24>;
20} // Anonymous namespace
21
22void PositionPass(Environment& env, IR::Program& program) {
23 if (env.ShaderStage() != Stage::VertexB || env.ReadViewportTransformState()) {
24 return;
25 }
26
27 Info& info{program.info};
28 info.uses_render_area = true;
29
30 PositionInstVector to_replace;
31 for (IR::Block* const block : program.post_order_blocks) {
32 for (IR::Inst& inst : block->Instructions()) {
33 switch (inst.GetOpcode()) {
34 case IR::Opcode::SetAttribute: {
35 const IR::Attribute attr{inst.Arg(0).Attribute()};
36 switch (attr) {
37 case IR::Attribute::PositionX:
38 case IR::Attribute::PositionY: {
39 to_replace.push_back(PositionInst{.inst = &inst, .block = block, .attr = attr});
40 break;
41 }
42 default:
43 break;
44 }
45 break;
46 }
47 default:
48 break;
49 }
50 }
51 }
52
53 for (PositionInst& position_inst : to_replace) {
54 IR::IREmitter ir{*position_inst.block,
55 IR::Block::InstructionList::s_iterator_to(*position_inst.inst)};
56 const IR::F32 value(position_inst.inst->Arg(1));
57 const IR::F32F64 scale(ir.Imm32(2.f));
58 const IR::F32 negative_one{ir.Imm32(-1.f)};
59 switch (position_inst.attr) {
60 case IR::Attribute::PositionX: {
61 position_inst.inst->SetArg(
62 1,
63 ir.FPFma(value, ir.FPMul(ir.FPRecip(ir.RenderAreaWidth()), scale), negative_one));
64 break;
65 }
66 case IR::Attribute::PositionY: {
67 position_inst.inst->SetArg(
68 1,
69 ir.FPFma(value, ir.FPMul(ir.FPRecip(ir.RenderAreaHeight()), scale), negative_one));
70 break;
71 }
72 default:
73 break;
74 }
75 }
76}
77} // namespace Shader::Optimization
diff --git a/src/shader_recompiler/shader_info.h b/src/shader_recompiler/shader_info.h
index f5690805c..e4b5ba567 100644
--- a/src/shader_recompiler/shader_info.h
+++ b/src/shader_recompiler/shader_info.h
@@ -175,6 +175,7 @@ struct Info {
175 bool uses_shadow_lod{}; 175 bool uses_shadow_lod{};
176 bool uses_rescaling_uniform{}; 176 bool uses_rescaling_uniform{};
177 bool uses_cbuf_indirect{}; 177 bool uses_cbuf_indirect{};
178 bool uses_render_area{};
178 179
179 IR::Type used_constant_buffer_types{}; 180 IR::Type used_constant_buffer_types{};
180 IR::Type used_storage_buffer_types{}; 181 IR::Type used_storage_buffer_types{};