hdkv/yuzu
1
Fork 0
Code Issues Pull Requests Releases 1 Activity

early-access version 4005

Browse Source
This commit is contained in:
pineappleEA
2023-12-04 03:26:49 +01:00
parent ad11d18846
commit 989787a69a
19 changed files with 234 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
View File

@@ -145,7 +145,8 @@ Shader::AttributeType AttributeType(const FixedPipelineState& state, size_t inde
Shader::RuntimeInfo MakeRuntimeInfo(std::span<const Shader::IR::Program> programs,
const GraphicsPipelineCacheKey& key,
const Shader::IR::Program& program,
const Shader::IR::Program* previous_program) {
const Shader::IR::Program* previous_program,
u32 max_num_cbufs) {
Shader::RuntimeInfo info;
if (previous_program) {
info.previous_stage_stores = previous_program->info.stores;
@@ -261,6 +262,7 @@ Shader::RuntimeInfo MakeRuntimeInfo(std::span<const Shader::IR::Program> program
}
info.force_early_z = key.state.early_z != 0;
info.y_negate = key.state.y_negate != 0;
info.max_num_cbufs = max_num_cbufs;
return info;
}
@@ -655,6 +657,7 @@ std::unique_ptr<GraphicsPipeline> PipelineCache::CreateGraphicsPipeline(
const Shader::IR::Program* previous_stage{};
Shader::Backend::Bindings binding;
const u32 max_num_cbufs{static_cast<u32>(device.GetMaxPerStageUniformBuffers())};
for (size_t index = uses_vertex_a && uses_vertex_b ? 1 : 0; index < Maxwell::MaxShaderProgram;
++index) {
const bool is_emulated_stage = layer_source_program != nullptr &&
@@ -668,7 +671,8 @@ std::unique_ptr<GraphicsPipeline> PipelineCache::CreateGraphicsPipeline(
const size_t stage_index{index - 1};
infos[stage_index] = &program.info;
const auto runtime_info{MakeRuntimeInfo(programs, key, program, previous_stage)};
const auto runtime_info{
MakeRuntimeInfo(programs, key, program, previous_stage, max_num_cbufs)};
ConvertLegacyToGeneric(program, runtime_info);
const std::vector<u32> code{EmitSPIRV(profile, runtime_info, program, binding)};
device.SaveShader(code);
@@ -764,7 +768,10 @@ std::unique_ptr<ComputePipeline> PipelineCache::CreateComputePipeline(
}
auto program{TranslateProgram(pools.inst, pools.block, env, cfg, host_info)};
const std::vector<u32> code{EmitSPIRV(profile, program)};
const Shader::RuntimeInfo info{
.max_num_cbufs = static_cast<u32>(device.GetMaxPerStageUniformBuffers()),
};
const std::vector<u32> code{EmitSPIRV(profile, info, program)};
device.SaveShader(code);
vk::ShaderModule spv_module{BuildShader(device, code)};
if (device.HasDebuggingToolAttached()) {