OpenPunk/yuzu
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu.git synced 2024-11-14 22:40:06 +00:00
Code Issues Projects Releases Wiki Activity

Vulkan: Max UBO checks

Browse Source
This commit is contained in:
Ameer J 2023-11-26 22:32:32 -05:00
parent 72aff2873d
commit cb6e5ef048
3 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/video_core/renderer_opengl/gl_shader_cache.cpp
View File

@ -581,10 +581,10 @@ std::unique_ptr<ComputePipeline> ShaderCache::CreateComputePipeline(
auto program{TranslateProgram(pools.inst, pools.block, env, cfg, host_info)}; auto program{TranslateProgram(pools.inst, pools.block, env, cfg, host_info)};
const u32 num_storage_buffers{Shader::NumDescriptors(program.info.storage_buffers_descriptors)}; const u32 num_storage_buffers{Shader::NumDescriptors(program.info.storage_buffers_descriptors)};
Shader::RuntimeInfo info{}; const Shader::RuntimeInfo info{
info.glasm_use_storage_buffers = num_storage_buffers <= device.GetMaxGLASMStorageBufferBlocks(); .glasm_use_storage_buffers = num_storage_buffers <= device.GetMaxGLASMStorageBufferBlocks(),
info.max_num_cbufs = device.GetMaxUniformBuffers(program.stage); .max_num_cbufs = device.GetMaxUniformBuffers(program.stage),
};
std::string code{}; std::string code{};
std::vector<u32> code_spirv; std::vector<u32> code_spirv;
switch (device.GetShaderBackend()) { switch (device.GetShaderBackend()) {

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

5
src/video_core/vulkan_common/vulkan_device.h
View File

@ -304,6 +304,11 @@ public:
return properties.properties.limits.maxComputeSharedMemorySize; return properties.properties.limits.maxComputeSharedMemorySize;
} }
/// Returns the maximum number of uniform buffers allowed per stage.
VkDeviceSize GetMaxPerStageUniformBuffers() const {
return properties.properties.limits.maxPerStageDescriptorUniformBuffers;
}
/// Returns float control properties of the device. /// Returns float control properties of the device.
const VkPhysicalDeviceFloatControlsPropertiesKHR& FloatControlProperties() const { const VkPhysicalDeviceFloatControlsPropertiesKHR& FloatControlProperties() const {
return properties.float_controls; return properties.float_controls;