octo/citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4918 from vitor-k/warnings

Browse Source 
Silence warnings from unused code and mismatched declaration
This commit is contained in:
Pengfei Zhu
2019-09-06 22:08:06 +08:00
committed by GitHub
parent 8c2a33553a 61f9710d95
commit 4bc22aa350
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/hle/service/gsp/gsp_gpu.h
View File

@@ -185,7 +185,8 @@ static_assert(sizeof(CommandBuffer) == 0x200, "CommandBuffer struct has incorrec
class GSP_GPU; class GSP_GPU;
struct SessionData : public Kernel::SessionRequestHandler::SessionDataBase { class SessionData : public Kernel::SessionRequestHandler::SessionDataBase {
public:
SessionData(); SessionData();
SessionData(GSP_GPU* gsp); SessionData(GSP_GPU* gsp);
~SessionData(); ~SessionData();

2
src/core/hle/service/ptm/ptm.cpp
View File

@@ -188,7 +188,7 @@ static GameCoin ReadGameCoinData() {
LOG_ERROR(Service_PTM, "Could not open the game coin data file!"); LOG_ERROR(Service_PTM, "Could not open the game coin data file!");
return default_game_coin; return default_game_coin;
} }
u16 result;
auto gamecoin = std::move(gamecoin_result).Unwrap(); auto gamecoin = std::move(gamecoin_result).Unwrap();
GameCoin gamecoin_data; GameCoin gamecoin_data;
gamecoin->Read(0, sizeof(GameCoin), reinterpret_cast<u8*>(&gamecoin_data)); gamecoin->Read(0, sizeof(GameCoin), reinterpret_cast<u8*>(&gamecoin_data));

1
src/video_core/renderer_opengl/gl_shader_gen.cpp
View File

@@ -1738,7 +1738,6 @@ struct Vertex {
semantic(VSOutputAttributes::POSITION_Y) + ", " + semantic(VSOutputAttributes::POSITION_Y) + ", " +
semantic(VSOutputAttributes::POSITION_Z) + ", " + semantic(VSOutputAttributes::POSITION_Z) + ", " +
semantic(VSOutputAttributes::POSITION_W) + ");\n"; semantic(VSOutputAttributes::POSITION_W) + ");\n";
semantic(VSOutputAttributes::POSITION_W) + ");\n";
out += " gl_Position = vtx_pos;\n"; out += " gl_Position = vtx_pos;\n";
out += "#if !defined(CITRA_GLES) || defined(GL_EXT_clip_cull_distance)\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 out += " gl_ClipDistance[0] = -vtx_pos.z;\n"; // fixed PICA clipping plane z <= 0