summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2019-07-16 17:38:48 +0200
committerLioncash <mathew1800@gmail.com>2019-07-19 03:03:30 +0200
commit45fa12a05c8ba20259979d4b9e40d7401d825502 (patch)
tree9186a91982f02a5a1c8464e343256f4f112a3d4d
parentvideo_core/control_flow: Make program_size for ScanFlow() a std::size_t (diff)
downloadyuzu-45fa12a05c8ba20259979d4b9e40d7401d825502.tar
yuzu-45fa12a05c8ba20259979d4b9e40d7401d825502.tar.gz
yuzu-45fa12a05c8ba20259979d4b9e40d7401d825502.tar.bz2
yuzu-45fa12a05c8ba20259979d4b9e40d7401d825502.tar.lz
yuzu-45fa12a05c8ba20259979d4b9e40d7401d825502.tar.xz
yuzu-45fa12a05c8ba20259979d4b9e40d7401d825502.tar.zst
yuzu-45fa12a05c8ba20259979d4b9e40d7401d825502.zip
-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 {
struct CFGRebuildState {
explicit CFGRebuildState(const ProgramCode& program_code, const std::size_t program_size,
const u32 start)
- : program_code{program_code}, program_size{program_size}, start{start} {}
+ : start{start}, program_code{program_code}, program_size{program_size} {}
u32 start{};
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;
StagingCache::~StagingCache() = default;
SurfaceBaseImpl::SurfaceBaseImpl(GPUVAddr gpu_addr, const SurfaceParams& params)
- : params{params}, mipmap_sizes(params.num_levels),
- mipmap_offsets(params.num_levels), gpu_addr{gpu_addr}, host_memory_size{
- params.GetHostSizeInBytes()} {
+ : params{params}, host_memory_size{params.GetHostSizeInBytes()}, gpu_addr{gpu_addr},
+ mipmap_sizes(params.num_levels), mipmap_offsets(params.num_levels) {
std::size_t offset = 0;
for (u32 level = 0; level < params.num_levels; ++level) {
const std::size_t mipmap_size{params.GetGuestMipmapSize(level)};