diff options
| author | ReinUsesLisp <reinuseslisp@airmail.cc> | 2021-02-13 06:26:34 +0100 |
|---|---|---|
| committer | ReinUsesLisp <reinuseslisp@airmail.cc> | 2021-02-13 06:26:47 +0100 |
| commit | 5b35b01070a5ec072ec5c886d79ce8f9ba087e11 (patch) | |
| tree | 6b03de14854551270b4017a4cb7785f041b05840 /src | |
| parent | vk_staging_buffer_pool: Fix softlock when stream buffer overflows (diff) | |
| download | yuzu-5b35b01070a5ec072ec5c886d79ce8f9ba087e11.tar yuzu-5b35b01070a5ec072ec5c886d79ce8f9ba087e11.tar.gz yuzu-5b35b01070a5ec072ec5c886d79ce8f9ba087e11.tar.bz2 yuzu-5b35b01070a5ec072ec5c886d79ce8f9ba087e11.tar.lz yuzu-5b35b01070a5ec072ec5c886d79ce8f9ba087e11.tar.xz yuzu-5b35b01070a5ec072ec5c886d79ce8f9ba087e11.tar.zst yuzu-5b35b01070a5ec072ec5c886d79ce8f9ba087e11.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.cpp | 7 | ||||
| -rw-r--r-- | src/video_core/renderer_vulkan/vk_shader_decompiler.cpp | 6 |
2 files changed, 5 insertions, 8 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index ddc668fbc..ecffc6abf 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp @@ -51,14 +51,7 @@ MICROPROFILE_DEFINE(OpenGL_CacheManagement, "OpenGL", "Cache Management", MP_RGB namespace { -constexpr size_t NUM_CONST_BUFFERS_PER_STAGE = 18; -constexpr size_t NUM_CONST_BUFFERS_BYTES_PER_STAGE = - NUM_CONST_BUFFERS_PER_STAGE * Maxwell::MaxConstBufferSize; -constexpr size_t TOTAL_CONST_BUFFER_BYTES = - NUM_CONST_BUFFERS_BYTES_PER_STAGE * Maxwell::MaxShaderStage; - constexpr size_t NUM_SUPPORTED_VERTEX_ATTRIBUTES = 16; -constexpr size_t NUM_SUPPORTED_VERTEX_BINDINGS = 16; struct TextureHandle { constexpr TextureHandle(u32 data, bool via_header_index) { diff --git a/src/video_core/renderer_vulkan/vk_shader_decompiler.cpp b/src/video_core/renderer_vulkan/vk_shader_decompiler.cpp index e165a6987..40e2e0d38 100644 --- a/src/video_core/renderer_vulkan/vk_shader_decompiler.cpp +++ b/src/video_core/renderer_vulkan/vk_shader_decompiler.cpp @@ -3106,7 +3106,11 @@ ShaderEntries GenerateShaderEntries(const VideoCommon::Shader::ShaderIR& ir) { entries.const_buffers.emplace_back(cbuf.second, cbuf.first); } for (const auto& [base, usage] : ir.GetGlobalMemory()) { - entries.global_buffers.emplace_back(base.cbuf_index, base.cbuf_offset, usage.is_written); + entries.global_buffers.emplace_back(GlobalBufferEntry{ + .cbuf_index = base.cbuf_index, + .cbuf_offset = base.cbuf_offset, + .is_written = usage.is_written, + }); } for (const auto& sampler : ir.GetSamplers()) { if (sampler.is_buffer) { |