INSANEMODE/yuzu-android
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu-android.git synced 2025-06-10 16:37:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

shader: Implement TXQ and fix FragDepth

Browse Source
This commit is contained in:
ReinUsesLisp
2021-03-26 18:45:38 -03:00
committed by ameerj
parent d9c5bd9509
commit 17063d16a3
15 changed files with 264 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/shader_recompiler/frontend/ir/ir_emitter.cpp
View File

@ -1493,6 +1493,12 @@ Value IREmitter::ImageFetch(const Value& handle, const Value& coords, const Valu
return Inst(op, Flags{info}, handle, coords, offset, lod, multisampling);
}
Value IREmitter::ImageQueryDimension(const Value& handle, const IR::U32& lod) {
const Opcode op{handle.IsImmediate() ? Opcode::BoundImageQueryDimensions
: Opcode::BindlessImageQueryDimensions};
return Inst(op, handle, lod);
}
U1 IREmitter::VoteAll(const U1& value) {
return Inst<U1>(Opcode::VoteAll, value);
}

1
src/shader_recompiler/frontend/ir/ir_emitter.h
View File

@ -239,6 +239,7 @@ public:
const F32& dref, const F32& lod,
const Value& offset, const F32& lod_clamp,
TextureInstInfo info);
[[nodiscard]] Value ImageQueryDimension(const Value& handle, const IR::U32& lod);
[[nodiscard]] Value ImageGather(const Value& handle, const Value& coords, const Value& offset,
const Value& offset2, TextureInstInfo info);

3
src/shader_recompiler/frontend/ir/opcodes.inc
View File

@ -356,6 +356,7 @@ OPCODE(BindlessImageSampleDrefExplicitLod, F32, U32,
OPCODE(BindlessImageGather, F32x4, U32, Opaque, Opaque, Opaque, )
OPCODE(BindlessImageGatherDref, F32x4, U32, Opaque, Opaque, Opaque, F32, )
OPCODE(BindlessImageFetch, F32x4, U32, Opaque, U32, U32, )
OPCODE(BindlessImageQueryDimensions, U32x4, U32, U32, )
OPCODE(BoundImageSampleImplicitLod, F32x4, U32, Opaque, Opaque, Opaque, )
OPCODE(BoundImageSampleExplicitLod, F32x4, U32, Opaque, Opaque, Opaque, )
@ -364,6 +365,7 @@ OPCODE(BoundImageSampleDrefExplicitLod, F32, U32,
OPCODE(BoundImageGather, F32x4, U32, Opaque, Opaque, Opaque, )
OPCODE(BoundImageGatherDref, F32x4, U32, Opaque, Opaque, Opaque, F32, )
OPCODE(BoundImageFetch, F32x4, U32, Opaque, U32, U32, )
OPCODE(BoundImageQueryDimensions, U32x4, U32, U32, )
OPCODE(ImageSampleImplicitLod, F32x4, U32, Opaque, Opaque, Opaque, )
OPCODE(ImageSampleExplicitLod, F32x4, U32, Opaque, Opaque, Opaque, )
@ -372,6 +374,7 @@ OPCODE(ImageSampleDrefExplicitLod, F32, U32,
OPCODE(ImageGather, F32x4, U32, Opaque, Opaque, Opaque, )
OPCODE(ImageGatherDref, F32x4, U32, Opaque, Opaque, Opaque, F32, )
OPCODE(ImageFetch, F32x4, U32, Opaque, U32, U32, )
OPCODE(ImageQueryDimensions, U32x4, U32, U32, )
// Warp operations
OPCODE(VoteAll, U1, U1, )

8
src/shader_recompiler/frontend/maxwell/translate/impl/not_implemented.cpp
View File

@ -373,14 +373,6 @@ void TranslatorVisitor::TXD_b(u64) {
ThrowNotImplemented(Opcode::TXD_b);
}
void TranslatorVisitor::TXQ(u64) {
ThrowNotImplemented(Opcode::TXQ);
}
void TranslatorVisitor::TXQ_b(u64) {
ThrowNotImplemented(Opcode::TXQ_b);
}
void TranslatorVisitor::VABSDIFF(u64) {
ThrowNotImplemented(Opcode::VABSDIFF);
}

76
src/shader_recompiler/frontend/maxwell/translate/impl/texture_query.cpp Normal file
View File

@ -0,0 +1,76 @@
// 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 Mode : u64 {
Dimension = 1,
TextureType = 2,
SamplePos = 5,
};
IR::Value Query(TranslatorVisitor& v, const IR::U32& handle, Mode mode, IR::Reg src_reg) {
switch (mode) {
case Mode::Dimension: {
const IR::U32 lod{v.X(src_reg)};
return v.ir.ImageQueryDimension(handle, lod);
}
case Mode::TextureType:
case Mode::SamplePos:
default:
throw NotImplementedException("Mode {}", mode);
}
}
void Impl(TranslatorVisitor& v, u64 insn, std::optional<u32> cbuf_offset) {
union {
u64 raw;
BitField<49, 1, u64> nodep;
BitField<0, 8, IR::Reg> dest_reg;
BitField<8, 8, IR::Reg> src_reg;
BitField<22, 3, Mode> mode;
BitField<31, 4, u64> mask;
} const txq{insn};
IR::Reg src_reg{txq.src_reg};
IR::U32 handle;
if (cbuf_offset) {
handle = v.ir.Imm32(*cbuf_offset);
} else {
handle = v.X(src_reg);
++src_reg;
}
const IR::Value query{Query(v, handle, txq.mode, src_reg)};
IR::Reg dest_reg{txq.dest_reg};
for (int element = 0; element < 4; ++element) {
if (((txq.mask >> element) & 1) == 0) {
continue;
}
v.X(dest_reg, IR::U32{v.ir.CompositeExtract(query, element)});
++dest_reg;
}
}
} // Anonymous namespace
void TranslatorVisitor::TXQ(u64 insn) {
union {
u64 raw;
BitField<36, 13, u64> cbuf_offset;
} const txq{insn};
Impl(*this, insn, static_cast<u32>(txq.cbuf_offset));
}
void TranslatorVisitor::TXQ_b(u64 insn) {
Impl(*this, insn, std::nullopt);
}
} // namespace Shader::Maxwell