summaryrefslogtreecommitdiffstats
path: root/src/video_core/renderer_vulkan
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2020-07-21 06:52:27 +0200
committerLioncash <mathew1800@gmail.com>2020-07-21 06:57:25 +0200
commite17fb5ee97dab16c73b017393b6544847e9aef67 (patch)
tree05ac8d70e8516d27062f4940e64d905c95c2b6c5 /src/video_core/renderer_vulkan
parentMerge pull request #4376 from ogniK5377/dark-wait-tree (diff)
downloadyuzu-e17fb5ee97dab16c73b017393b6544847e9aef67.tar
yuzu-e17fb5ee97dab16c73b017393b6544847e9aef67.tar.gz
yuzu-e17fb5ee97dab16c73b017393b6544847e9aef67.tar.bz2
yuzu-e17fb5ee97dab16c73b017393b6544847e9aef67.tar.lz
yuzu-e17fb5ee97dab16c73b017393b6544847e9aef67.tar.xz
yuzu-e17fb5ee97dab16c73b017393b6544847e9aef67.tar.zst
yuzu-e17fb5ee97dab16c73b017393b6544847e9aef67.zip
Diffstat (limited to 'src/video_core/renderer_vulkan')
-rw-r--r--src/video_core/renderer_vulkan/fixed_pipeline_state.cpp1
-rw-r--r--src/video_core/renderer_vulkan/vk_shader_decompiler.cpp5
2 files changed, 2 insertions, 4 deletions
diff --git a/src/video_core/renderer_vulkan/fixed_pipeline_state.cpp b/src/video_core/renderer_vulkan/fixed_pipeline_state.cpp
index d1f0ea932..81a39a3b8 100644
--- a/src/video_core/renderer_vulkan/fixed_pipeline_state.cpp
+++ b/src/video_core/renderer_vulkan/fixed_pipeline_state.cpp
@@ -40,7 +40,6 @@ constexpr std::array POLYGON_OFFSET_ENABLE_LUT = {
} // Anonymous namespace
void FixedPipelineState::Fill(const Maxwell& regs, bool has_extended_dynamic_state) {
- const auto& clip = regs.view_volume_clip_control;
const std::array enabled_lut = {regs.polygon_offset_point_enable,
regs.polygon_offset_line_enable,
regs.polygon_offset_fill_enable};
diff --git a/src/video_core/renderer_vulkan/vk_shader_decompiler.cpp b/src/video_core/renderer_vulkan/vk_shader_decompiler.cpp
index 97429cc59..54b20fa3d 100644
--- a/src/video_core/renderer_vulkan/vk_shader_decompiler.cpp
+++ b/src/video_core/renderer_vulkan/vk_shader_decompiler.cpp
@@ -700,9 +700,9 @@ private:
}
void DeclareInternalFlags() {
- constexpr std::array names = {"zero", "sign", "carry", "overflow"};
+ static constexpr std::array names{"zero", "sign", "carry", "overflow"};
+
for (std::size_t flag = 0; flag < INTERNAL_FLAGS_COUNT; ++flag) {
- const auto flag_code = static_cast<InternalFlag>(flag);
const Id id = OpVariable(t_prv_bool, spv::StorageClass::Private, v_false);
internal_flags[flag] = AddGlobalVariable(Name(id, names[flag]));
}
@@ -2798,7 +2798,6 @@ private:
std::map<GlobalMemoryBase, Id> global_buffers;
std::map<u32, TexelBuffer> uniform_texels;
std::map<u32, SampledImage> sampled_images;
- std::map<u32, TexelBuffer> storage_texels;
std::map<u32, StorageImage> images;
std::array<Id, Maxwell::NumRenderTargets> frag_colors{};