GitHub/skyline
2
0
Fork 0
mirror of https://github.com/skyline-emu/skyline.git synced 2024-12-28 06:25:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add support for parsing and compiling compute shaders to the shader manager

Browse Source
This commit is contained in:
Billy Laws 2022-11-18 21:42:24 +00:00
parent 86dab65af4
commit 4267a6af36
2 changed files with 89 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
app/src/main/cpp/skyline/gpu/shader_manager.cpp
View File

@ -142,6 +142,82 @@ namespace skyline::gpu {
void Dump(u64 hash) final {}
};
/**
* @brief A shader environment for all compute pipeline stages
*/
class ComputeEnvironment : public Shader::Environment {
private:
span<u8> binary;
u32 baseOffset;
u32 textureBufferIndex;
u32 localMemorySize;
u32 sharedMemorySize;
std::array<u32, 3> workgroupDimensions;
ShaderManager::ConstantBufferRead constantBufferRead;
ShaderManager::GetTextureType getTextureType;
public:
std::vector<ShaderManager::ConstantBufferWord> constantBufferWords;
std::vector<ShaderManager::CachedTextureType> textureTypes;
ComputeEnvironment(span<u8> pBinary,
u32 baseOffset,
u32 textureBufferIndex,
u32 localMemorySize, u32 sharedMemorySize,
std::array<u32, 3> workgroupDimensions,
ShaderManager::ConstantBufferRead constantBufferRead, ShaderManager::GetTextureType getTextureType)
: binary{pBinary},
baseOffset{baseOffset},
textureBufferIndex{textureBufferIndex},
localMemorySize{localMemorySize},
sharedMemorySize{sharedMemorySize},
workgroupDimensions{workgroupDimensions},
constantBufferRead{std::move(constantBufferRead)},
getTextureType{std::move(getTextureType)} {
stage = Shader::Stage::Compute;
start_address = baseOffset;
}
[[nodiscard]] u64 ReadInstruction(u32 address) final {
address -= baseOffset;
if (binary.size() < (address + sizeof(u64)))
throw exception("Out of bounds instruction read: 0x{:X}", address);
return *reinterpret_cast<u64 *>(binary.data() + address);
}
[[nodiscard]] u32 ReadCbufValue(u32 index, u32 offset) final {
auto value{constantBufferRead(index, offset)};
constantBufferWords.emplace_back(index, offset, value);
return value;
}
[[nodiscard]] Shader::TextureType ReadTextureType(u32 handle) final {
auto type{getTextureType(handle)};
textureTypes.emplace_back(handle, type);
return type;
}
[[nodiscard]] u32 TextureBoundBuffer() const final {
return textureBufferIndex;
}
[[nodiscard]] u32 LocalMemorySize() const final {
return localMemorySize;
}
[[nodiscard]] u32 SharedMemorySize() const final {
return sharedMemorySize;
}
[[nodiscard]] std::array<u32, 3> WorkgroupSize() const final {
return workgroupDimensions;
}
void Dump(u64 hash) final {}
};
/**
* @brief A shader environment for VertexB during combination as it only requires the shader header and no higher level context
*/
@ -202,7 +278,16 @@ namespace skyline::gpu {
return Shader::Maxwell::MergeDualVertexPrograms(vertexA, vertexB, env);
}
vk::ShaderModule ShaderManager::CompileShader(Shader::RuntimeInfo &runtimeInfo, Shader::IR::Program &program, Shader::Backend::Bindings &bindings) {
Shader::IR::Program ShaderManager::ParseComputeShader(span<u8> binary, u32 baseOffset, u32 textureConstantBufferIndex, u32 localMemorySize, u32 sharedMemorySize, std::array<u32, 3> workgroupDimensions, const ConstantBufferRead &constantBufferRead, const GetTextureType &getTextureType) {
std::scoped_lock lock{poolMutex};
ComputeEnvironment environment{binary, baseOffset, textureConstantBufferIndex, localMemorySize, sharedMemorySize, workgroupDimensions, constantBufferRead, getTextureType};
Shader::Maxwell::Flow::CFG cfg{environment, flowBlockPool, Shader::Maxwell::Location{static_cast<u32>(baseOffset)}};
return Shader::Maxwell::TranslateProgram(instructionPool, blockPool, environment, cfg, hostTranslateInfo);
}
vk::ShaderModule ShaderManager::CompileShader(const Shader::RuntimeInfo &runtimeInfo, Shader::IR::Program &program, Shader::Backend::Bindings &bindings) {
std::scoped_lock lock{poolMutex};
if (program.info.loads.Legacy() || program.info.stores.Legacy())

4
app/src/main/cpp/skyline/gpu/shader_manager.h
View File

@ -69,7 +69,9 @@ namespace skyline::gpu {
*/
Shader::IR::Program CombineVertexShaders(Shader::IR::Program &vertexA, Shader::IR::Program &vertexB, span<u8> vertexBBinary);
vk::ShaderModule CompileShader(Shader::RuntimeInfo &runtimeInfo, Shader::IR::Program &program, Shader::Backend::Bindings &bindings);
Shader::IR::Program ParseComputeShader(span<u8> binary, u32 baseOffset, u32 textureConstantBufferIndex, u32 localMemorySize, u32 sharedMemorySize, std::array<u32, 3> workgroupDimensions, const ConstantBufferRead &constantBufferRead, const GetTextureType &getTextureType);
vk::ShaderModule CompileShader(const Shader::RuntimeInfo &runtimeInfo, Shader::IR::Program &program, Shader::Backend::Bindings &bindings);
void ResetPools();
};