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

Update to latest hades

Browse Source
This commit is contained in:
Billy Laws 2023-01-08 19:30:19 +00:00
parent 44f6aada18
commit 0a608fb4b2
4 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/libraries/shader-compiler

@ -1 +1 @@
Subproject commit 58ae23f7dbd87eaf40f90ba90e4d8aa2c29d363c
Subproject commit ffcaed48cd067a4e720740c09578641d29043c0d

2
app/src/main/cpp/skyline/gpu/pipeline_cache_manager.cpp
View File

@ -8,7 +8,7 @@
namespace skyline::gpu {
struct PipelineCacheFileHeader {
static constexpr u32 Magic{util::MakeMagic<u32>("PCHE")}; //!< The magic value used to identify a pipeline cache file
static constexpr u32 Version{1}; //!< The version of the pipeline cache file format, MUST be incremented for any format changes
static constexpr u32 Version{2}; //!< The version of the pipeline cache file format, MUST be incremented for any format changes
u32 magic{Magic};
u32 version{Version};

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

@ -83,7 +83,7 @@ namespace skyline::gpu {
.support_snorm_render_buffer = true,
.support_viewport_index_layer = gpu.traits.supportsShaderViewportIndexLayer,
.min_ssbo_alignment = traits.minimumStorageBufferAlignment,
.support_geometry_passthrough = false
.support_geometry_shader_passthrough = false
};
constexpr u32 TegraX1WarpSize{32}; //!< The amount of threads in a warp on the Tegra X1
@ -121,6 +121,7 @@ namespace skyline::gpu {
.has_broken_spirv_position_input = traits.quirks.brokenSpirvPositionInput,
.has_broken_spirv_subgroup_mask_vector_extract_dynamic = traits.quirks.brokenSubgroupMaskExtractDynamic,
.has_broken_spirv_subgroup_shuffle = traits.quirks.brokenSubgroupShuffle,
.max_subgroup_size = traits.subgroupSize,
};
Shader::Settings::values = {
@ -164,6 +165,7 @@ namespace skyline::gpu {
stage = pStage;
sph = *reinterpret_cast<Shader::ProgramHeader *>(binary.data());
start_address = baseOffset;
is_propietary_driver = textureBufferIndex == 2;
}
[[nodiscard]] u64 ReadInstruction(u32 address) final {
@ -205,6 +207,14 @@ namespace skyline::gpu {
return {0, 0, 0}; // Only relevant for compute shaders
}
[[nodiscard]] bool HasHLEMacroState() const final {
return false;
}
[[nodiscard]] std::optional<Shader::ReplaceConstant> GetReplaceConstBuffer(u32 bank, u32 offset) final {
return std::nullopt;
}
void Dump(u64 hash) final {}
};
@ -239,6 +249,7 @@ namespace skyline::gpu {
getTextureType{std::move(getTextureType)} {
stage = Shader::Stage::Compute;
start_address = baseOffset;
is_propietary_driver = textureBufferIndex == 2;
}
[[nodiscard]] u64 ReadInstruction(u32 address) final {
@ -280,6 +291,14 @@ namespace skyline::gpu {
return workgroupDimensions;
}
[[nodiscard]] bool HasHLEMacroState() const final {
return false;
}
[[nodiscard]] std::optional<Shader::ReplaceConstant> GetReplaceConstBuffer(u32 bank, u32 offset) final {
return std::nullopt;
}
void Dump(u64 hash) final {}
};
@ -383,13 +402,13 @@ namespace skyline::gpu {
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) {
vk::ShaderModule ShaderManager::CompileShader(const Shader::RuntimeInfo &runtimeInfo, Shader::IR::Program &program, Shader::Backend::Bindings &bindings, u64 hash) {
std::scoped_lock lock{poolMutex};
if (program.info.loads.Legacy() || program.info.stores.Legacy())
Shader::Maxwell::ConvertLegacyToGeneric(program, runtimeInfo);
auto spirv{Shader::Backend::SPIRV::EmitSPIRV(profile, runtimeInfo, program, bindings)};
auto spirv{Shader::Backend::SPIRV::EmitSPIRV(profile, runtimeInfo, program, bindings, fmt::format("shader_{:016X}", hash))};
vk::ShaderModuleCreateInfo createInfo{
.pCode = spirv.data(),

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

@ -68,7 +68,7 @@ namespace skyline::gpu {
Shader::IR::Program ParseComputeShader(u64 hash, 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);
vk::ShaderModule CompileShader(const Shader::RuntimeInfo &runtimeInfo, Shader::IR::Program &program, Shader::Backend::Bindings &bindings, u64 hash = 0);
void ResetPools();
};