From 6e3652d15baac64533a10737da87699e35188ad4 Mon Sep 17 00:00:00 2001 From: vitor-k Date: Mon, 2 Sep 2019 22:45:38 -0300 Subject: [PATCH 1/2] Struct vs class declaration and unused variable --- src/core/hle/service/gsp/gsp_gpu.h | 3 ++- src/core/hle/service/ptm/ptm.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/core/hle/service/gsp/gsp_gpu.h b/src/core/hle/service/gsp/gsp_gpu.h index 1c264837c..8b43b9cea 100644 --- a/src/core/hle/service/gsp/gsp_gpu.h +++ b/src/core/hle/service/gsp/gsp_gpu.h @@ -185,7 +185,8 @@ static_assert(sizeof(CommandBuffer) == 0x200, "CommandBuffer struct has incorrec class GSP_GPU; -struct SessionData : public Kernel::SessionRequestHandler::SessionDataBase { +class SessionData : public Kernel::SessionRequestHandler::SessionDataBase { +public: SessionData(); SessionData(GSP_GPU* gsp); ~SessionData(); diff --git a/src/core/hle/service/ptm/ptm.cpp b/src/core/hle/service/ptm/ptm.cpp index f86ce78dc..7d30fcc5b 100644 --- a/src/core/hle/service/ptm/ptm.cpp +++ b/src/core/hle/service/ptm/ptm.cpp @@ -188,7 +188,7 @@ static GameCoin ReadGameCoinData() { LOG_ERROR(Service_PTM, "Could not open the game coin data file!"); return default_game_coin; } - u16 result; + auto gamecoin = std::move(gamecoin_result).Unwrap(); GameCoin gamecoin_data; gamecoin->Read(0, sizeof(GameCoin), reinterpret_cast(&gamecoin_data)); From 61f9710d950e231150f43e0e5299b6787ab5a122 Mon Sep 17 00:00:00 2001 From: vitor-k Date: Thu, 5 Sep 2019 17:11:38 -0300 Subject: [PATCH 2/2] remove unused call to nodiscard function --- src/video_core/renderer_opengl/gl_shader_gen.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/video_core/renderer_opengl/gl_shader_gen.cpp b/src/video_core/renderer_opengl/gl_shader_gen.cpp index 1e9e856ce..1c5e08ee2 100644 --- a/src/video_core/renderer_opengl/gl_shader_gen.cpp +++ b/src/video_core/renderer_opengl/gl_shader_gen.cpp @@ -1759,7 +1759,6 @@ struct Vertex { semantic(VSOutputAttributes::POSITION_Y) + ", " + semantic(VSOutputAttributes::POSITION_Z) + ", " + semantic(VSOutputAttributes::POSITION_W) + ");\n"; - semantic(VSOutputAttributes::POSITION_W) + ");\n"; out += " gl_Position = vtx_pos;\n"; out += "#if !defined(CITRA_GLES) || defined(GL_EXT_clip_cull_distance)\n"; out += " gl_ClipDistance[0] = -vtx_pos.z;\n"; // fixed PICA clipping plane z <= 0