Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Update native, minor UI stuff and cleanups

Browse source
This commit is contained in:
Henrik Rydgard 2013-08-10 23:04:23 +02:00
parent d32e10ff0b
commit 0dac2b4783
6 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -17,6 +17,7 @@
*.suo
*.aps
*.exp
*.qdact
Debug
Release
Windows/x64

2
Core/ELF/PBPReader.cpp
View file

@ -38,7 +38,7 @@ PBPReader::PBPReader(const char *filename) : header_() {
return;
}
INFO_LOG(LOADER, "Loading PBP, version = %08x", header_.version);
DEBUG_LOG(LOADER, "Loading PBP, version = %08x", header_.version);
}
u8 *PBPReader::GetSubFile(PBPSubFile file, size_t *outSize) {

12
Core/MIPS/x86/Jit.cpp
View file

@ -278,11 +278,7 @@ const u8 *Jit::DoJit(u32 em_address, JitBlock *b)
fpr.Start(mips_, analysis);
js.numInstructions = 0;
while (js.compiling)
{
if (js.prefixS & 0xF0000000) {
ERROR_LOG(CPU, "GARBAGE prefix S : %08x at %08x : %s", js.prefixS, js.compilerPC, currentMIPS->DisasmAt(js.compilerPC));
}
while (js.compiling) {
// Jit breakpoints are quite fast, so let's do them in release too.
CheckJitBreakpoint(js.compilerPC, 0);
@ -291,8 +287,7 @@ const u8 *Jit::DoJit(u32 em_address, JitBlock *b)
MIPSCompileOp(inst);
if (js.afterOp & JitState::AFTER_CORE_STATE)
{
if (js.afterOp & JitState::AFTER_CORE_STATE) {
// TODO: Save/restore?
FlushAll();
@ -314,9 +309,6 @@ const u8 *Jit::DoJit(u32 em_address, JitBlock *b)
js.compilerPC += 4;
js.numInstructions++;
}
if (js.prefixS & 0xF0000000) {
ERROR_LOG(CPU, "GARBAGE prefix S : %08x at %08x : %s", js.prefixS, js.compilerPC, currentMIPS->DisasmAt(js.compilerPC));
}
b->codeSize = (u32)(GetCodePtr() - b->normalEntry);
NOP();

2
UI/MainScreen.cpp
View file

@ -122,6 +122,8 @@ void GameButton::Draw(UIContext &dc) {
dropsize = 3;
y += txOffset * 2;
}
dc.Draw()->Flush();
dc.RebindTexture();
dc.Draw()->DrawImage4Grid(I_DROP_SHADOW, x - dropsize, y, x+w + dropsize, y+h+dropsize*1.5, alphaMul(shadowColor, 0.5f), 1.0f);
dc.Draw()->Flush();
}

5
UI/MiscScreens.cpp
View file

@ -108,6 +108,7 @@ NewLanguageScreen::NewLanguageScreen() : ListPopupScreen("Language") {
VFSGetFileListing("lang", &langs_, "ini");
#endif
std::vector<std::string> listing;
int selected = -1;
for (size_t i = 0; i < langs_.size(); i++) {
// Skip README
if (langs_[i].name.find("README") != std::string::npos) {
@ -129,10 +130,12 @@ NewLanguageScreen::NewLanguageScreen() : ListPopupScreen("Language") {
buttonTitle = langValuesMapping[code].first;
}
}
if (g_Config.languageIni == code)
selected = i;
listing.push_back(buttonTitle);
}
adaptor_ = UI::StringVectorListAdaptor(listing, 0);
adaptor_ = UI::StringVectorListAdaptor(listing, selected);
}
void NewLanguageScreen::OnCompleted() {

2
native

@ -1 +1 @@
Subproject commit 44c239ef182e2904aada4b1424165a1adf45b2cf
Subproject commit 0c8692bc44715aa64b0e592c0001413fe0b80b1c