summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Lioncash2019-07-16 11:38:48 -0400
committerGravatar Lioncash2019-07-18 21:03:30 -0400
commit45fa12a05c8ba20259979d4b9e40d7401d825502 (patch)
tree9186a91982f02a5a1c8464e343256f4f112a3d4d /src
parentvideo_core/control_flow: Make program_size for ScanFlow() a std::size_t (diff)
downloadyuzu-45fa12a05c8ba20259979d4b9e40d7401d825502.tar.gz
yuzu-45fa12a05c8ba20259979d4b9e40d7401d825502.tar.xz
yuzu-45fa12a05c8ba20259979d4b9e40d7401d825502.zip
video_core: Resolve -Wreorder warnings
Ensures that the constructor members are always initialized in the order that they're declared in.
Diffstat (limited to 'src')
-rw-r--r--src/video_core/shader/control_flow.cpp2
-rw-r--r--src/video_core/texture_cache/surface_base.cpp5
2 files changed, 3 insertions, 4 deletions
diff --git a/src/video_core/shader/control_flow.cpp b/src/video_core/shader/control_flow.cpp
index 20f9a6480..6a92c540e 100644
--- a/src/video_core/shader/control_flow.cpp
+++ b/src/video_core/shader/control_flow.cpp
@@ -58,7 +58,7 @@ struct BlockInfo {
58struct CFGRebuildState { 58struct CFGRebuildState {
59 explicit CFGRebuildState(const ProgramCode& program_code, const std::size_t program_size, 59 explicit CFGRebuildState(const ProgramCode& program_code, const std::size_t program_size,
60 const u32 start) 60 const u32 start)
61 : program_code{program_code}, program_size{program_size}, start{start} {} 61 : start{start}, program_code{program_code}, program_size{program_size} {}
62 62
63 u32 start{}; 63 u32 start{};
64 std::vector<BlockInfo> block_info{}; 64 std::vector<BlockInfo> block_info{};
diff --git a/src/video_core/texture_cache/surface_base.cpp b/src/video_core/texture_cache/surface_base.cpp
index 6af9044ca..683c49207 100644
--- a/src/video_core/texture_cache/surface_base.cpp
+++ b/src/video_core/texture_cache/surface_base.cpp
@@ -24,9 +24,8 @@ StagingCache::StagingCache() = default;
24StagingCache::~StagingCache() = default; 24StagingCache::~StagingCache() = default;
25 25
26SurfaceBaseImpl::SurfaceBaseImpl(GPUVAddr gpu_addr, const SurfaceParams& params) 26SurfaceBaseImpl::SurfaceBaseImpl(GPUVAddr gpu_addr, const SurfaceParams& params)
27 : params{params}, mipmap_sizes(params.num_levels), 27 : params{params}, host_memory_size{params.GetHostSizeInBytes()}, gpu_addr{gpu_addr},
28 mipmap_offsets(params.num_levels), gpu_addr{gpu_addr}, host_memory_size{ 28 mipmap_sizes(params.num_levels), mipmap_offsets(params.num_levels) {
29 params.GetHostSizeInBytes()} {
30 std::size_t offset = 0; 29 std::size_t offset = 0;
31 for (u32 level = 0; level < params.num_levels; ++level) { 30 for (u32 level = 0; level < params.num_levels; ++level) {
32 const std::size_t mipmap_size{params.GetGuestMipmapSize(level)}; 31 const std::size_t mipmap_size{params.GetGuestMipmapSize(level)};