summaryrefslogtreecommitdiff
path: root/src/video_core
diff options
context:
space:
mode:
authorGravatar ReinUsesLisp2021-02-13 02:26:34 -0300
committerGravatar ReinUsesLisp2021-02-13 02:26:47 -0300
commit5b35b01070a5ec072ec5c886d79ce8f9ba087e11 (patch)
tree6b03de14854551270b4017a4cb7785f041b05840 /src/video_core
parentvk_staging_buffer_pool: Fix softlock when stream buffer overflows (diff)
downloadyuzu-5b35b01070a5ec072ec5c886d79ce8f9ba087e11.tar.gz
yuzu-5b35b01070a5ec072ec5c886d79ce8f9ba087e11.tar.xz
yuzu-5b35b01070a5ec072ec5c886d79ce8f9ba087e11.zip
video_core: Fix clang build issues
Diffstat (limited to 'src/video_core')
-rw-r--r--src/video_core/renderer_opengl/gl_rasterizer.cpp7
-rw-r--r--src/video_core/renderer_vulkan/vk_shader_decompiler.cpp6
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
51 51
52namespace { 52namespace {
53 53
54constexpr size_t NUM_CONST_BUFFERS_PER_STAGE = 18;
55constexpr size_t NUM_CONST_BUFFERS_BYTES_PER_STAGE =
56 NUM_CONST_BUFFERS_PER_STAGE * Maxwell::MaxConstBufferSize;
57constexpr size_t TOTAL_CONST_BUFFER_BYTES =
58 NUM_CONST_BUFFERS_BYTES_PER_STAGE * Maxwell::MaxShaderStage;
59
60constexpr size_t NUM_SUPPORTED_VERTEX_ATTRIBUTES = 16; 54constexpr size_t NUM_SUPPORTED_VERTEX_ATTRIBUTES = 16;
61constexpr size_t NUM_SUPPORTED_VERTEX_BINDINGS = 16;
62 55
63struct TextureHandle { 56struct TextureHandle {
64 constexpr TextureHandle(u32 data, bool via_header_index) { 57 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) {
3106 entries.const_buffers.emplace_back(cbuf.second, cbuf.first); 3106 entries.const_buffers.emplace_back(cbuf.second, cbuf.first);
3107 } 3107 }
3108 for (const auto& [base, usage] : ir.GetGlobalMemory()) { 3108 for (const auto& [base, usage] : ir.GetGlobalMemory()) {
3109 entries.global_buffers.emplace_back(base.cbuf_index, base.cbuf_offset, usage.is_written); 3109 entries.global_buffers.emplace_back(GlobalBufferEntry{
3110 .cbuf_index = base.cbuf_index,
3111 .cbuf_offset = base.cbuf_offset,
3112 .is_written = usage.is_written,
3113 });
3110 } 3114 }
3111 for (const auto& sampler : ir.GetSamplers()) { 3115 for (const auto& sampler : ir.GetSamplers()) {
3112 if (sampler.is_buffer) { 3116 if (sampler.is_buffer) {