mirror of
https://git.h3cjp.net/H3cJP/yuzu.git
synced 2024-11-15 16:02:50 +00:00
Shader_IR: Implement initial code for tracking indexed samplers.
This commit is contained in:
parent
64496f2456
commit
603c861532
|
@ -230,6 +230,12 @@ using Node = std::shared_ptr<NodeData>;
|
||||||
using Node4 = std::array<Node, 4>;
|
using Node4 = std::array<Node, 4>;
|
||||||
using NodeBlock = std::vector<Node>;
|
using NodeBlock = std::vector<Node>;
|
||||||
|
|
||||||
|
class BindlessSamplerNode;
|
||||||
|
class ArraySamplerNode;
|
||||||
|
|
||||||
|
using TrackSamplerData = std::variant<BindlessSamplerNode, ArraySamplerNode>;
|
||||||
|
using TrackSampler = std::shared_ptr<TrackSamplerData>;
|
||||||
|
|
||||||
class Sampler {
|
class Sampler {
|
||||||
public:
|
public:
|
||||||
/// This constructor is for bound samplers
|
/// This constructor is for bound samplers
|
||||||
|
@ -288,6 +294,48 @@ private:
|
||||||
bool is_bindless{}; ///< Whether this sampler belongs to a bindless texture or not.
|
bool is_bindless{}; ///< Whether this sampler belongs to a bindless texture or not.
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/// Represents a tracked bindless sampler into a direct const buffer
|
||||||
|
class ArraySamplerNode final {
|
||||||
|
public:
|
||||||
|
explicit ArraySamplerNode(u32 index, u32 base_offset, u32 bindless_var)
|
||||||
|
: index{index}, base_offset{base_offset}, bindless_var{bindless_var} {}
|
||||||
|
|
||||||
|
u32 GetIndex() const {
|
||||||
|
return index;
|
||||||
|
}
|
||||||
|
|
||||||
|
u32 GetBaseOffset() const {
|
||||||
|
return base_offset;
|
||||||
|
}
|
||||||
|
|
||||||
|
u32 GetIndexVar() const {
|
||||||
|
return bindless_var;
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
u32 index;
|
||||||
|
u32 base_offset;
|
||||||
|
u32 bindless_var;
|
||||||
|
};
|
||||||
|
|
||||||
|
/// Represents a tracked bindless sampler into a direct const buffer
|
||||||
|
class BindlessSamplerNode final {
|
||||||
|
public:
|
||||||
|
explicit BindlessSamplerNode(u32 index, u32 offset) : index{index}, offset{offset} {}
|
||||||
|
|
||||||
|
u32 GetIndex() const {
|
||||||
|
return index;
|
||||||
|
}
|
||||||
|
|
||||||
|
u32 GetOffset() const {
|
||||||
|
return offset;
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
u32 index;
|
||||||
|
u32 offset;
|
||||||
|
};
|
||||||
|
|
||||||
class Image final {
|
class Image final {
|
||||||
public:
|
public:
|
||||||
/// This constructor is for bound images
|
/// This constructor is for bound images
|
||||||
|
|
|
@ -45,6 +45,12 @@ Node MakeNode(Args&&... args) {
|
||||||
return std::make_shared<NodeData>(T(std::forward<Args>(args)...));
|
return std::make_shared<NodeData>(T(std::forward<Args>(args)...));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
template <typename T, typename... Args>
|
||||||
|
TrackSampler MakeTrackSampler(Args&&... args) {
|
||||||
|
static_assert(std::is_convertible_v<T, TrackSamplerData>);
|
||||||
|
return std::make_shared<TrackSamplerData>(T(std::forward<Args>(args)...));
|
||||||
|
}
|
||||||
|
|
||||||
template <typename... Args>
|
template <typename... Args>
|
||||||
Node Operation(OperationCode code, Args&&... args) {
|
Node Operation(OperationCode code, Args&&... args) {
|
||||||
if constexpr (sizeof...(args) == 0) {
|
if constexpr (sizeof...(args) == 0) {
|
||||||
|
|
|
@ -388,6 +388,9 @@ private:
|
||||||
|
|
||||||
std::tuple<Node, u32, u32> TrackCbuf(Node tracked, const NodeBlock& code, s64 cursor) const;
|
std::tuple<Node, u32, u32> TrackCbuf(Node tracked, const NodeBlock& code, s64 cursor) const;
|
||||||
|
|
||||||
|
std::tuple<Node, TrackSampler> TrackSampler(Node tracked, const NodeBlock& code,
|
||||||
|
s64 cursor) const;
|
||||||
|
|
||||||
std::optional<u32> TrackImmediate(Node tracked, const NodeBlock& code, s64 cursor) const;
|
std::optional<u32> TrackImmediate(Node tracked, const NodeBlock& code, s64 cursor) const;
|
||||||
|
|
||||||
std::pair<Node, s64> TrackRegister(const GprNode* tracked, const NodeBlock& code,
|
std::pair<Node, s64> TrackRegister(const GprNode* tracked, const NodeBlock& code,
|
||||||
|
|
|
@ -8,6 +8,7 @@
|
||||||
|
|
||||||
#include "common/common_types.h"
|
#include "common/common_types.h"
|
||||||
#include "video_core/shader/node.h"
|
#include "video_core/shader/node.h"
|
||||||
|
#include "video_core/shader/node_helper.h"
|
||||||
#include "video_core/shader/shader_ir.h"
|
#include "video_core/shader/shader_ir.h"
|
||||||
|
|
||||||
namespace VideoCommon::Shader {
|
namespace VideoCommon::Shader {
|
||||||
|
@ -37,6 +38,87 @@ std::pair<Node, s64> FindOperation(const NodeBlock& code, s64 cursor,
|
||||||
}
|
}
|
||||||
} // Anonymous namespace
|
} // Anonymous namespace
|
||||||
|
|
||||||
|
std::optional<std::pair<Node, Node>> DecoupleIndirectRead(const OperationNode& operation) {
|
||||||
|
if (operation.GetCode() != OperationCode::UAdd) {
|
||||||
|
return std::nullopt;
|
||||||
|
}
|
||||||
|
Node gpr{};
|
||||||
|
Node offset{};
|
||||||
|
if (operation.GetOperandsCount() != 2) {
|
||||||
|
return std::nullopt;
|
||||||
|
}
|
||||||
|
for (std::size_t i = 0; i < operation.GetOperandsCount(); i++) {
|
||||||
|
Node operand = operation[i];
|
||||||
|
if (std::holds_alternative<ImmediateNode>(*operand)) {
|
||||||
|
offset = operation[i];
|
||||||
|
} else if (std::holds_alternative<GprNode>(*operand)) {
|
||||||
|
gpr = operation[i];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (offset && gpr) {
|
||||||
|
return {std::make_pair(gpr, offset)};
|
||||||
|
}
|
||||||
|
return std::nullopt;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::tuple<Node, TrackSampler> ShaderIR::TrackSampler(Node tracked, const NodeBlock& code,
|
||||||
|
s64 cursor) const {
|
||||||
|
if (const auto cbuf = std::get_if<CbufNode>(&*tracked)) {
|
||||||
|
// Constant buffer found, test if it's an immediate
|
||||||
|
const auto offset = cbuf->GetOffset();
|
||||||
|
if (const auto immediate = std::get_if<ImmediateNode>(&*offset)) {
|
||||||
|
auto track =
|
||||||
|
MakeTrackSampler<BindlessSamplerNode>(cbuf->GetIndex(), immediate->GetValue());
|
||||||
|
return {tracked, track};
|
||||||
|
} else if (const auto operation = std::get_if<OperationNode>(&*offset)) {
|
||||||
|
auto bound_buffer = locker.ObtainBoundBuffer();
|
||||||
|
if (!bound_buffer) {
|
||||||
|
return {};
|
||||||
|
}
|
||||||
|
if (*bound_buffer != cbuf->GetIndex()) {
|
||||||
|
return {};
|
||||||
|
}
|
||||||
|
auto pair = DecoupleIndirectRead(*operation);
|
||||||
|
if (!pair) {
|
||||||
|
return {};
|
||||||
|
}
|
||||||
|
auto [gpr, base_offset] = *pair;
|
||||||
|
const auto offset_inm = std::get_if<ImmediateNode>(&*base_offset);
|
||||||
|
// TODO Implement Bindless Index custom variable
|
||||||
|
auto track =
|
||||||
|
MakeTrackSampler<ArraySamplerNode>(cbuf->GetIndex(), offset_inm->GetValue(), 0);
|
||||||
|
return {tracked, track};
|
||||||
|
}
|
||||||
|
return {};
|
||||||
|
}
|
||||||
|
if (const auto gpr = std::get_if<GprNode>(&*tracked)) {
|
||||||
|
if (gpr->GetIndex() == Tegra::Shader::Register::ZeroIndex) {
|
||||||
|
return {};
|
||||||
|
}
|
||||||
|
// Reduce the cursor in one to avoid infinite loops when the instruction sets the same
|
||||||
|
// register that it uses as operand
|
||||||
|
const auto [source, new_cursor] = TrackRegister(gpr, code, cursor - 1);
|
||||||
|
if (!source) {
|
||||||
|
return {};
|
||||||
|
}
|
||||||
|
return TrackSampler(source, code, new_cursor);
|
||||||
|
}
|
||||||
|
if (const auto operation = std::get_if<OperationNode>(&*tracked)) {
|
||||||
|
for (std::size_t i = operation->GetOperandsCount(); i > 0; --i) {
|
||||||
|
if (auto found = TrackSampler((*operation)[i - 1], code, cursor); std::get<0>(found)) {
|
||||||
|
// Cbuf found in operand.
|
||||||
|
return found;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return {};
|
||||||
|
}
|
||||||
|
if (const auto conditional = std::get_if<ConditionalNode>(&*tracked)) {
|
||||||
|
const auto& conditional_code = conditional->GetCode();
|
||||||
|
return TrackSampler(tracked, conditional_code, static_cast<s64>(conditional_code.size()));
|
||||||
|
}
|
||||||
|
return {};
|
||||||
|
}
|
||||||
|
|
||||||
std::tuple<Node, u32, u32> ShaderIR::TrackCbuf(Node tracked, const NodeBlock& code,
|
std::tuple<Node, u32, u32> ShaderIR::TrackCbuf(Node tracked, const NodeBlock& code,
|
||||||
s64 cursor) const {
|
s64 cursor) const {
|
||||||
if (const auto cbuf = std::get_if<CbufNode>(&*tracked)) {
|
if (const auto cbuf = std::get_if<CbufNode>(&*tracked)) {
|
||||||
|
|
Loading…
Reference in a new issue