Merge branch 'master' of https://github.com/citra-emu/citra

weihuoya · Sep 7, 2019 · fc979e1 · fc979e1
2 parents 005aaac + 4bc22aa
commit fc979e1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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<u8*>(&gamecoin_data));

diff --git a/src/video_core/renderer_opengl/gl_shader_gen.cpp b/src/video_core/renderer_opengl/gl_shader_gen.cpp
@@ -1738,7 +1738,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