From bafb7afba2d07b0ee2e7ecd4fb8e6a699cebc481 Mon Sep 17 00:00:00 2001
From: Martin Lindhe <martin@ubique.se>
Date: Fri, 25 Sep 2015 14:33:39 +0200
Subject: [PATCH] fix some xcode 7.0 warnings
---
src/core/hle/service/cfg/cfg.cpp | 2 +-
src/core/tracer/recorder.cpp | 6 +++---
src/video_core/gpu_debugger.h | 1 -
src/video_core/rasterizer.cpp | 4 ++++
src/video_core/renderer_opengl/renderer_opengl.h | 1 -
5 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/core/hle/service/cfg/cfg.cpp b/src/core/hle/service/cfg/cfg.cpp
index 715a9b8c3..56986a49e 100644
--- a/src/core/hle/service/cfg/cfg.cpp
+++ b/src/core/hle/service/cfg/cfg.cpp
@@ -345,7 +345,7 @@ ResultCode FormatConfig() {
char16_t country_name_buffer[16][0x40] = {};
for (size_t i = 0; i < 16; ++i) {
- auto size = Common::UTF8ToUTF16("Gensokyo").copy(country_name_buffer[i], 0x40);
+ Common::UTF8ToUTF16("Gensokyo").copy(country_name_buffer[i], 0x40);
}
// 0x000B0001 - Localized names for the profile Country
res = CreateConfigInfoBlk(0x000B0001, sizeof(country_name_buffer), 0xE, country_name_buffer);
diff --git a/src/core/tracer/recorder.cpp b/src/core/tracer/recorder.cpp
index 656706c0c..c6dc35c83 100644
--- a/src/core/tracer/recorder.cpp
+++ b/src/core/tracer/recorder.cpp
@@ -143,11 +143,11 @@ void Recorder::Finish(const std::string& filename) {
}
void Recorder::FrameFinished() {
- stream.push_back( { FrameMarker } );
+ stream.push_back( { { FrameMarker } } );
}
void Recorder::MemoryAccessed(const u8* data, u32 size, u32 physical_address) {
- StreamElement element = { MemoryLoad };
+ StreamElement element = { { MemoryLoad } };
element.data.memory_load.size = size;
element.data.memory_load.physical_address = physical_address;
@@ -168,7 +168,7 @@ void Recorder::MemoryAccessed(const u8* data, u32 size, u32 physical_address) {
template<typename T>
void Recorder::RegisterWritten(u32 physical_address, T value) {
- StreamElement element = { RegisterWrite };
+ StreamElement element = { { RegisterWrite } };
element.data.register_write.size = (sizeof(T) == 1) ? CTRegisterWrite::SIZE_8
: (sizeof(T) == 2) ? CTRegisterWrite::SIZE_16
: (sizeof(T) == 4) ? CTRegisterWrite::SIZE_32
diff --git a/src/video_core/gpu_debugger.h b/src/video_core/gpu_debugger.h
index fae5de7d1..a3aab216c 100644
--- a/src/video_core/gpu_debugger.h
+++ b/src/video_core/gpu_debugger.h
@@ -45,7 +45,6 @@ public:
private:
GraphicsDebugger* observed;
- bool in_destruction;
friend class GraphicsDebugger;
};
diff --git a/src/video_core/rasterizer.cpp b/src/video_core/rasterizer.cpp
index 6e2266b1c..7abf60292 100644
--- a/src/video_core/rasterizer.cpp
+++ b/src/video_core/rasterizer.cpp
@@ -967,6 +967,8 @@ static void ProcessTriangleInternal(const Shader::OutputVertex& v0,
UNIMPLEMENTED();
break;
}
+
+ return {};
};
auto LookupFactorA = [&](Regs::BlendFactor factor) -> u8 {
@@ -1000,6 +1002,8 @@ static void ProcessTriangleInternal(const Shader::OutputVertex& v0,
UNIMPLEMENTED();
break;
}
+
+ return {};
};
static auto EvaluateBlendEquation = [](const Math::Vec4<u8>& src, const Math::Vec4<u8>& srcfactor,
diff --git a/src/video_core/renderer_opengl/renderer_opengl.h b/src/video_core/renderer_opengl/renderer_opengl.h
index 5677e538b..b42df7654 100644
--- a/src/video_core/renderer_opengl/renderer_opengl.h
+++ b/src/video_core/renderer_opengl/renderer_opengl.h
@@ -62,7 +62,6 @@ private:
const TextureInfo& texture);
EmuWindow* render_window; ///< Handle to render window
- u32 last_mode; ///< Last render mode
int resolution_width; ///< Current resolution width
int resolution_height; ///< Current resolution height