diff options
Diffstat (limited to '')
| -rw-r--r-- | src/core/hle/service/cfg/cfg.cpp | 2 | ||||
| -rw-r--r-- | src/core/tracer/recorder.cpp | 6 | ||||
| -rw-r--r-- | src/video_core/gpu_debugger.h | 1 | ||||
| -rw-r--r-- | src/video_core/rasterizer.cpp | 4 | ||||
| -rw-r--r-- | 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() { | |||
| 345 | 345 | ||
| 346 | char16_t country_name_buffer[16][0x40] = {}; | 346 | char16_t country_name_buffer[16][0x40] = {}; |
| 347 | for (size_t i = 0; i < 16; ++i) { | 347 | for (size_t i = 0; i < 16; ++i) { |
| 348 | auto size = Common::UTF8ToUTF16("Gensokyo").copy(country_name_buffer[i], 0x40); | 348 | Common::UTF8ToUTF16("Gensokyo").copy(country_name_buffer[i], 0x40); |
| 349 | } | 349 | } |
| 350 | // 0x000B0001 - Localized names for the profile Country | 350 | // 0x000B0001 - Localized names for the profile Country |
| 351 | res = CreateConfigInfoBlk(0x000B0001, sizeof(country_name_buffer), 0xE, country_name_buffer); | 351 | 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) { | |||
| 143 | } | 143 | } |
| 144 | 144 | ||
| 145 | void Recorder::FrameFinished() { | 145 | void Recorder::FrameFinished() { |
| 146 | stream.push_back( { FrameMarker } ); | 146 | stream.push_back( { { FrameMarker } } ); |
| 147 | } | 147 | } |
| 148 | 148 | ||
| 149 | void Recorder::MemoryAccessed(const u8* data, u32 size, u32 physical_address) { | 149 | void Recorder::MemoryAccessed(const u8* data, u32 size, u32 physical_address) { |
| 150 | StreamElement element = { MemoryLoad }; | 150 | StreamElement element = { { MemoryLoad } }; |
| 151 | element.data.memory_load.size = size; | 151 | element.data.memory_load.size = size; |
| 152 | element.data.memory_load.physical_address = physical_address; | 152 | element.data.memory_load.physical_address = physical_address; |
| 153 | 153 | ||
| @@ -168,7 +168,7 @@ void Recorder::MemoryAccessed(const u8* data, u32 size, u32 physical_address) { | |||
| 168 | 168 | ||
| 169 | template<typename T> | 169 | template<typename T> |
| 170 | void Recorder::RegisterWritten(u32 physical_address, T value) { | 170 | void Recorder::RegisterWritten(u32 physical_address, T value) { |
| 171 | StreamElement element = { RegisterWrite }; | 171 | StreamElement element = { { RegisterWrite } }; |
| 172 | element.data.register_write.size = (sizeof(T) == 1) ? CTRegisterWrite::SIZE_8 | 172 | element.data.register_write.size = (sizeof(T) == 1) ? CTRegisterWrite::SIZE_8 |
| 173 | : (sizeof(T) == 2) ? CTRegisterWrite::SIZE_16 | 173 | : (sizeof(T) == 2) ? CTRegisterWrite::SIZE_16 |
| 174 | : (sizeof(T) == 4) ? CTRegisterWrite::SIZE_32 | 174 | : (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: | |||
| 45 | 45 | ||
| 46 | private: | 46 | private: |
| 47 | GraphicsDebugger* observed; | 47 | GraphicsDebugger* observed; |
| 48 | bool in_destruction; | ||
| 49 | 48 | ||
| 50 | friend class GraphicsDebugger; | 49 | friend class GraphicsDebugger; |
| 51 | }; | 50 | }; |
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, | |||
| 967 | UNIMPLEMENTED(); | 967 | UNIMPLEMENTED(); |
| 968 | break; | 968 | break; |
| 969 | } | 969 | } |
| 970 | |||
| 971 | return {}; | ||
| 970 | }; | 972 | }; |
| 971 | 973 | ||
| 972 | auto LookupFactorA = [&](Regs::BlendFactor factor) -> u8 { | 974 | auto LookupFactorA = [&](Regs::BlendFactor factor) -> u8 { |
| @@ -1000,6 +1002,8 @@ static void ProcessTriangleInternal(const Shader::OutputVertex& v0, | |||
| 1000 | UNIMPLEMENTED(); | 1002 | UNIMPLEMENTED(); |
| 1001 | break; | 1003 | break; |
| 1002 | } | 1004 | } |
| 1005 | |||
| 1006 | return {}; | ||
| 1003 | }; | 1007 | }; |
| 1004 | 1008 | ||
| 1005 | static auto EvaluateBlendEquation = [](const Math::Vec4<u8>& src, const Math::Vec4<u8>& srcfactor, | 1009 | 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: | |||
| 62 | const TextureInfo& texture); | 62 | const TextureInfo& texture); |
| 63 | 63 | ||
| 64 | EmuWindow* render_window; ///< Handle to render window | 64 | EmuWindow* render_window; ///< Handle to render window |
| 65 | u32 last_mode; ///< Last render mode | ||
| 66 | 65 | ||
| 67 | int resolution_width; ///< Current resolution width | 66 | int resolution_width; ///< Current resolution width |
| 68 | int resolution_height; ///< Current resolution height | 67 | int resolution_height; ///< Current resolution height |