From 2dc86372c76afb134651499452bb5074b6d1e839 Mon Sep 17 00:00:00 2001
From: Rodrigo Locatti <rodrigo.locatti@gmail.com>
Date: Fri, 23 Apr 2021 02:38:02 -0300
Subject: [PATCH] shader: Fix bugs and build issues on GCC

---
 src/video_core/renderer_vulkan/vk_compute_pipeline.cpp  | 4 ++--
 src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp | 2 +-
 src/video_core/vulkan_common/vulkan_device.h            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/video_core/renderer_vulkan/vk_compute_pipeline.cpp b/src/video_core/renderer_vulkan/vk_compute_pipeline.cpp
index 6e9f66262b..6611c1de39 100644
--- a/src/video_core/renderer_vulkan/vk_compute_pipeline.cpp
+++ b/src/video_core/renderer_vulkan/vk_compute_pipeline.cpp
@@ -95,7 +95,7 @@ void ComputePipeline::Configure(Tegra::Engines::KeplerCompute& kepler_compute,
         ASSERT(((qmd.const_buffer_enable_mask >> desc.cbuf_index) & 1) != 0);
         const u32 index_offset{index << desc.size_shift};
         const u32 offset{desc.cbuf_offset + index_offset};
-        const GPUVAddr addr{cbufs[desc.cbuf_index].Address() + desc.cbuf_offset};
+        const GPUVAddr addr{cbufs[desc.cbuf_index].Address() + offset};
         if constexpr (std::is_same_v<decltype(desc), const Shader::TextureDescriptor&> ||
                       std::is_same_v<decltype(desc), const Shader::TextureBufferDescriptor&>) {
             if (desc.has_secondary) {
@@ -136,7 +136,7 @@ void ComputePipeline::Configure(Tegra::Engines::KeplerCompute& kepler_compute,
     ImageId* texture_buffer_ids{image_view_ids.data()};
     size_t index{};
     const auto add_buffer{[&](const auto& desc) {
-        for (u32 index = 0; index < desc.count; ++index) {
+        for (u32 i = 0; index < desc.count; ++i) {
             bool is_written{false};
             if constexpr (std::is_same_v<decltype(desc), const Shader::ImageBufferDescriptor&>) {
                 is_written = desc.is_written;
diff --git a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp
index e43db280f7..a8b402253e 100644
--- a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp
+++ b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp
@@ -226,7 +226,7 @@ void GraphicsPipeline::Configure(bool is_indexed) {
     for (size_t stage = 0; stage < Maxwell::MaxShaderStage; ++stage) {
         size_t index{};
         const auto add_buffer{[&](const auto& desc) {
-            for (u32 index = 0; index < desc.count; ++index) {
+            for (u32 i = 0; i < desc.count; ++i) {
                 bool is_written{false};
                 if constexpr (std::is_same_v<decltype(desc),
                                              const Shader::ImageBufferDescriptor&>) {
diff --git a/src/video_core/vulkan_common/vulkan_device.h b/src/video_core/vulkan_common/vulkan_device.h
index 4415558bb2..ebe0732936 100644
--- a/src/video_core/vulkan_common/vulkan_device.h
+++ b/src/video_core/vulkan_common/vulkan_device.h
@@ -4,10 +4,10 @@
 
 #pragma once
 
+#include <span>
 #include <string>
 #include <string_view>
 #include <unordered_map>
-#include <span>
 #include <vector>
 
 #include "common/common_types.h"