FernandoS27
5 years ago
committed by
ameerj
ameerj
13 changed files with 315 additions and 11 deletions
-
1src/shader_recompiler/CMakeLists.txt
-
8src/shader_recompiler/backend/spirv/emit_spirv.h
-
40src/shader_recompiler/backend/spirv/emit_spirv_image.cpp
-
13src/shader_recompiler/frontend/ir/ir_emitter.cpp
-
6src/shader_recompiler/frontend/ir/ir_emitter.h
-
1src/shader_recompiler/frontend/ir/modifiers.h
-
6src/shader_recompiler/frontend/ir/opcodes.inc
-
4src/shader_recompiler/frontend/maxwell/maxwell.inc
-
8src/shader_recompiler/frontend/maxwell/translate/impl/not_implemented.cpp
-
209src/shader_recompiler/frontend/maxwell/translate/impl/texture_gather.cpp
-
8src/shader_recompiler/ir_opt/collect_shader_info_pass.cpp
-
12src/shader_recompiler/ir_opt/constant_propagation_pass.cpp
-
10src/shader_recompiler/ir_opt/texture_pass.cpp
@ -0,0 +1,209 @@ |
|||
// Copyright 2021 yuzu Emulator Project
|
|||
// Licensed under GPLv2 or any later version
|
|||
// Refer to the license.txt file included.
|
|||
|
|||
#include <optional>
|
|||
|
|||
#include "common/bit_field.h"
|
|||
#include "common/common_types.h"
|
|||
#include "shader_recompiler/frontend/ir/modifiers.h"
|
|||
#include "shader_recompiler/frontend/maxwell/translate/impl/impl.h"
|
|||
|
|||
namespace Shader::Maxwell { |
|||
namespace { |
|||
|
|||
enum class TextureType : u64 { |
|||
_1D, |
|||
ARRAY_1D, |
|||
_2D, |
|||
ARRAY_2D, |
|||
_3D, |
|||
ARRAY_3D, |
|||
CUBE, |
|||
ARRAY_CUBE, |
|||
}; |
|||
|
|||
enum class OffsetType : u64 { |
|||
None = 0, |
|||
AOFFI, |
|||
PTP, |
|||
Invalid, |
|||
}; |
|||
|
|||
enum class ComponentType : u64 { |
|||
R = 0, |
|||
G = 1, |
|||
B = 2, |
|||
A = 3, |
|||
}; |
|||
|
|||
Shader::TextureType GetType(TextureType type, bool dc) { |
|||
switch (type) { |
|||
case TextureType::_1D: |
|||
return dc ? Shader::TextureType::Shadow1D : Shader::TextureType::Color1D; |
|||
case TextureType::ARRAY_1D: |
|||
return dc ? Shader::TextureType::ShadowArray1D : Shader::TextureType::ColorArray1D; |
|||
case TextureType::_2D: |
|||
return dc ? Shader::TextureType::Shadow2D : Shader::TextureType::Color2D; |
|||
case TextureType::ARRAY_2D: |
|||
return dc ? Shader::TextureType::ShadowArray2D : Shader::TextureType::ColorArray2D; |
|||
case TextureType::_3D: |
|||
return dc ? Shader::TextureType::Shadow3D : Shader::TextureType::Color3D; |
|||
case TextureType::ARRAY_3D: |
|||
throw NotImplementedException("3D array texture type"); |
|||
case TextureType::CUBE: |
|||
return dc ? Shader::TextureType::ShadowCube : Shader::TextureType::ColorCube; |
|||
case TextureType::ARRAY_CUBE: |
|||
return dc ? Shader::TextureType::ShadowArrayCube : Shader::TextureType::ColorArrayCube; |
|||
} |
|||
throw NotImplementedException("Invalid texture type {}", type); |
|||
} |
|||
|
|||
IR::Value MakeCoords(TranslatorVisitor& v, IR::Reg reg, TextureType type) { |
|||
const auto read_array{[&]() -> IR::F32 { return v.ir.ConvertUToF(32, 16, v.X(reg)); }}; |
|||
switch (type) { |
|||
case TextureType::_1D: |
|||
return v.F(reg); |
|||
case TextureType::ARRAY_1D: |
|||
return v.ir.CompositeConstruct(read_array(), v.F(reg + 1)); |
|||
case TextureType::_2D: |
|||
return v.ir.CompositeConstruct(v.F(reg), v.F(reg + 1)); |
|||
case TextureType::ARRAY_2D: |
|||
return v.ir.CompositeConstruct(read_array(), v.F(reg + 1), v.F(reg + 2)); |
|||
case TextureType::_3D: |
|||
return v.ir.CompositeConstruct(v.F(reg), v.F(reg + 1), v.F(reg + 2)); |
|||
case TextureType::ARRAY_3D: |
|||
throw NotImplementedException("3D array texture type"); |
|||
case TextureType::CUBE: |
|||
return v.ir.CompositeConstruct(v.F(reg), v.F(reg + 1), v.F(reg + 2)); |
|||
case TextureType::ARRAY_CUBE: |
|||
return v.ir.CompositeConstruct(read_array(), v.F(reg + 1), v.F(reg + 2), v.F(reg + 3)); |
|||
} |
|||
throw NotImplementedException("Invalid texture type {}", type); |
|||
} |
|||
|
|||
IR::Value MakeOffset(TranslatorVisitor& v, IR::Reg& reg, TextureType type) { |
|||
const IR::U32 value{v.X(reg++)}; |
|||
switch (type) { |
|||
case TextureType::_1D: |
|||
case TextureType::ARRAY_1D: |
|||
return v.ir.BitFieldExtract(value, v.ir.Imm32(0), v.ir.Imm32(6), true); |
|||
case TextureType::_2D: |
|||
case TextureType::ARRAY_2D: |
|||
return v.ir.CompositeConstruct( |
|||
v.ir.BitFieldExtract(value, v.ir.Imm32(0), v.ir.Imm32(6), true), |
|||
v.ir.BitFieldExtract(value, v.ir.Imm32(8), v.ir.Imm32(6), true)); |
|||
case TextureType::_3D: |
|||
case TextureType::ARRAY_3D: |
|||
return v.ir.CompositeConstruct( |
|||
v.ir.BitFieldExtract(value, v.ir.Imm32(0), v.ir.Imm32(6), true), |
|||
v.ir.BitFieldExtract(value, v.ir.Imm32(8), v.ir.Imm32(6), true), |
|||
v.ir.BitFieldExtract(value, v.ir.Imm32(16), v.ir.Imm32(6), true)); |
|||
case TextureType::CUBE: |
|||
case TextureType::ARRAY_CUBE: |
|||
throw NotImplementedException("Illegal offset on CUBE sample"); |
|||
} |
|||
throw NotImplementedException("Invalid texture type {}", type); |
|||
} |
|||
|
|||
std::pair<IR::Value, IR::Value> MakeOffsetPTP(TranslatorVisitor& v, IR::Reg& reg) { |
|||
const IR::U32 value1{v.X(reg++)}; |
|||
const IR::U32 value2{v.X(reg++)}; |
|||
const auto getVector = ([&v](const IR::U32& value) { |
|||
return v.ir.CompositeConstruct( |
|||
v.ir.BitFieldExtract(value, v.ir.Imm32(0), v.ir.Imm32(6), true), |
|||
v.ir.BitFieldExtract(value, v.ir.Imm32(8), v.ir.Imm32(6), true), |
|||
v.ir.BitFieldExtract(value, v.ir.Imm32(16), v.ir.Imm32(6), true), |
|||
v.ir.BitFieldExtract(value, v.ir.Imm32(24), v.ir.Imm32(6), true)); |
|||
}); |
|||
return {getVector(value1), getVector(value2)}; |
|||
} |
|||
|
|||
void Impl(TranslatorVisitor& v, u64 insn, ComponentType component_type, OffsetType offset_type, |
|||
bool is_bindless) { |
|||
union { |
|||
u64 raw; |
|||
BitField<35, 1, u64> ndv; |
|||
BitField<49, 1, u64> nodep; |
|||
BitField<50, 1, u64> dc; |
|||
BitField<51, 3, IR::Pred> sparse_pred; |
|||
BitField<0, 8, IR::Reg> dest_reg; |
|||
BitField<8, 8, IR::Reg> coord_reg; |
|||
BitField<20, 8, IR::Reg> meta_reg; |
|||
BitField<28, 3, TextureType> type; |
|||
BitField<31, 4, u64> mask; |
|||
BitField<36, 13, u64> cbuf_offset; |
|||
} const tld4{insn}; |
|||
|
|||
const IR::Value coords{MakeCoords(v, tld4.coord_reg, tld4.type)}; |
|||
|
|||
IR::Reg meta_reg{tld4.meta_reg}; |
|||
IR::Value handle; |
|||
IR::Value offset; |
|||
IR::Value offset2; |
|||
IR::F32 dref; |
|||
if (!is_bindless) { |
|||
handle = v.ir.Imm32(static_cast<u32>(tld4.cbuf_offset.Value() * 4)); |
|||
} else { |
|||
handle = v.X(meta_reg++); |
|||
} |
|||
switch (offset_type) { |
|||
case OffsetType::None: |
|||
break; |
|||
case OffsetType::AOFFI: { |
|||
offset = MakeOffset(v, meta_reg, tld4.type); |
|||
break; |
|||
} |
|||
case OffsetType::PTP: { |
|||
std::tie(offset, offset2) = MakeOffsetPTP(v, meta_reg); |
|||
break; |
|||
} |
|||
default: |
|||
throw NotImplementedException("Invalid offset type {}", offset_type); |
|||
} |
|||
if (tld4.dc != 0) { |
|||
dref = v.F(meta_reg++); |
|||
} |
|||
IR::TextureInstInfo info{}; |
|||
info.type.Assign(GetType(tld4.type, tld4.dc != 0)); |
|||
info.gather_component.Assign(static_cast<u32>(component_type)); |
|||
const IR::Value sample{[&]() -> IR::Value { |
|||
if (tld4.dc == 0) { |
|||
return v.ir.ImageGather(handle, coords, offset, offset2, info); |
|||
} |
|||
return v.ir.ImageGatherDref(handle, coords, offset, offset2, dref, info); |
|||
}()}; |
|||
|
|||
IR::Reg dest_reg{tld4.dest_reg}; |
|||
for (size_t element = 0; element < 4; ++element) { |
|||
if (((tld4.mask >> element) & 1) == 0) { |
|||
continue; |
|||
} |
|||
v.F(dest_reg, IR::F32{v.ir.CompositeExtract(sample, element)}); |
|||
++dest_reg; |
|||
} |
|||
if (tld4.sparse_pred != IR::Pred::PT) { |
|||
v.ir.SetPred(tld4.sparse_pred, v.ir.LogicalNot(v.ir.GetSparseFromOp(sample))); |
|||
} |
|||
} |
|||
} // Anonymous namespace
|
|||
|
|||
void TranslatorVisitor::TLD4(u64 insn) { |
|||
union { |
|||
u64 raw; |
|||
BitField<56, 2, ComponentType> component; |
|||
BitField<54, 2, OffsetType> offset; |
|||
} const tld4{insn}; |
|||
Impl(*this, insn, tld4.component, tld4.offset, false); |
|||
} |
|||
|
|||
void TranslatorVisitor::TLD4_b(u64 insn) { |
|||
union { |
|||
u64 raw; |
|||
BitField<38, 2, ComponentType> component; |
|||
BitField<36, 2, OffsetType> offset; |
|||
} const tld4{insn}; |
|||
Impl(*this, insn, tld4.component, tld4.offset, true); |
|||
} |
|||
|
|||
} // namespace Shader::Maxwell
|
|||
Write
Preview
Loading…
Cancel
Save
Reference in new issue