mirrors/rpcs3
0
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-08-18 00:11:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

more merge fixes, I should really compile it before submitting a pull request

Browse source
This commit is contained in:
Bigpet 2014-02-23 20:05:49 +01:00
commit 92fb77d50e
4 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rpcs3/Emu/Event.cpp
View file

@ -26,9 +26,9 @@ bool EventManager::RegisterKey(EventQueue* data, u64 key)
if (key_map.find(key) != key_map.end()) return false; if (key_map.find(key) != key_map.end()) return false;
for (auto& v = key_map.begin(); v != key_map.end(); ++v) for (auto& v : key_map)
{ {
if (v->second == data) return false; if (v.second == data) return false;
} }
key_map[key] = data; key_map[key] = data;

2
rpcs3/Emu/GS/GL/GLGSRender.cpp
View file

@ -652,7 +652,7 @@ void GLGSRender::OnInitThread()
glSwapInterval(Ini.GSVSyncEnable.GetValue() ? 1 : 0); glSwapInterval(Ini.GSVSyncEnable.GetValue() ? 1 : 0);
#else #else
if (GLXDrawable drawable = glXGetCurrentDrawable()){ if (GLXDrawable drawable = glXGetCurrentDrawable()){
//glXSwapIntervalEXT(glXGetCurrentDisplay(), drawable, Ini.GSVSyncEnable.GetValue() ? 1 : 0); glXSwapIntervalEXT(glXGetCurrentDisplay(), drawable, Ini.GSVSyncEnable.GetValue() ? 1 : 0);
} }
#endif #endif
glGenTextures(1, &g_depth_tex); glGenTextures(1, &g_depth_tex);

16
rpcs3/Emu/SysCalls/Modules/cellAdec.h
View file

@ -524,16 +524,16 @@ struct CellAdecParamM4Aac
be_t<MPEG4AAC_ConfigType> configNumber; be_t<MPEG4AAC_ConfigType> configNumber;
union { union {
struct { struct struct
{ {
be_t<u32> adifProgramNumber; // 0 be_t<u32> adifProgramNumber; // 0
} adifConfig; }; } adifConfig;
struct { struct struct
{ {
be_t<MPEG4AAC_SamplingFreq> samplingFreqIndex; be_t<MPEG4AAC_SamplingFreq> samplingFreqIndex;
be_t<u32> profile; // LC profile (1) be_t<u32> profile; // LC profile (1)
} rawDataBlockConfig; }; } rawDataBlockConfig;
} configInfo; } configInfo;
be_t<u32> enableDownmix; // enable downmix to 2.0 (if (enableDownmix)) be_t<u32> enableDownmix; // enable downmix to 2.0 (if (enableDownmix))
@ -557,7 +557,7 @@ struct CellAdecM4AacInfo
be_t<u32> pad1; // TODO: check alignment be_t<u32> pad1; // TODO: check alignment
union { union {
struct { struct struct
{ {
be_t<u32> copyrightIdPresent; be_t<u32> copyrightIdPresent;
char copyrightId[9]; char copyrightId[9];
@ -567,9 +567,9 @@ struct CellAdecM4AacInfo
be_t<u32> bitrate; be_t<u32> bitrate;
be_t<u32> numberOfProgramConfigElements; be_t<u32> numberOfProgramConfigElements;
be_t<u32> bufferFullness; be_t<u32> bufferFullness;
} adif; }; } adif;
struct { struct struct
{ {
be_t<u32> id; be_t<u32> id;
be_t<u32> layer; be_t<u32> layer;
@ -586,7 +586,7 @@ struct CellAdecM4AacInfo
be_t<u32> bufferFullness; be_t<u32> bufferFullness;
be_t<u32> numberOfRawDataBlocks; be_t<u32> numberOfRawDataBlocks;
be_t<u32> crcCheck; be_t<u32> crcCheck;
} adts; }; } adts;
} bsi; } bsi;
be_t<u32> pad2; // TODO: check alignment be_t<u32> pad2; // TODO: check alignment

6
rpcs3/Emu/SysCalls/lv2/SC_Lwmutex.cpp
View file

@ -54,10 +54,10 @@ int sys_lwmutex_destroy(mem_ptr_t<sys_lwmutex_t> lwmutex)
if (!Emu.GetIdManager().CheckID(sq_id)) return CELL_ESRCH; if (!Emu.GetIdManager().CheckID(sq_id)) return CELL_ESRCH;
// try to make it unable to lock // try to make it unable to lock
switch (int res = lwmutex->trylock(lwmutex->owner.GetDeadValue())) switch (int res = lwmutex->trylock(lwmutex->vars.parts.owner.GetDeadValue()))
{ {
case CELL_OK: case CELL_OK:
lwmutex->all_info = 0; lwmutex->vars.all_info = 0;
lwmutex->attribute = 0; lwmutex->attribute = 0;
lwmutex->sleep_queue = 0; lwmutex->sleep_queue = 0;
Emu.GetIdManager().RemoveID(sq_id); Emu.GetIdManager().RemoveID(sq_id);
@ -252,7 +252,7 @@ int sys_lwmutex_t::unlock(be_t<u32> tid)
case se32(SYS_SYNC_RETRY): break; case se32(SYS_SYNC_RETRY): break;
} }
if (target) vars.parts.owner.unlock(tid, target); if (target) vars.parts.owner.unlock(tid, target);
else owner.unlock(tid); else vars.parts.owner.unlock(tid);
} }
return CELL_OK; return CELL_OK;
} }