From a6eb25b58c2f325c714949c7a6ad5351b7aef9bb Mon Sep 17 00:00:00 2001 From: Henrik Rydgard Date: Sun, 18 Nov 2012 02:48:15 +0100 Subject: [PATCH 01/12] Disable blend on clear mode --- GPU/GLES/DisplayListInterpreter.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/GPU/GLES/DisplayListInterpreter.cpp b/GPU/GLES/DisplayListInterpreter.cpp index e70bd6b6fb..d927f94326 100644 --- a/GPU/GLES/DisplayListInterpreter.cpp +++ b/GPU/GLES/DisplayListInterpreter.cpp @@ -172,6 +172,7 @@ void EnterClearMode(u32 data) glColorMask(colMask, colMask, colMask, alphaMask); glDepthMask(updateZ); // Update Z or not // Note that depth test must be enabled for depth writes to go through! So we use GL_ALWAYS + glDisable(GL_BLEND); glEnable(GL_DEPTH_TEST); glDepthFunc(GL_ALWAYS); glDisable(GL_CULL_FACE); // ?? @@ -189,7 +190,7 @@ void LeaveClearMode() glColorMask(1,1,1,1); glEnDis(GL_DEPTH_TEST, gstate.zTestEnable & 1); glDepthFunc(GL_LEQUAL); // TODO - + glEnDis(GL_BLEND, gstate.alphaBlendEnable & 1); // dirtyshader? } From e37a1fb1d35f72e88323d4e5035c6c527425574b Mon Sep 17 00:00:00 2001 From: Henrik Rydgard Date: Sun, 18 Nov 2012 13:04:49 +0100 Subject: [PATCH 02/12] Add internal 2D drawing library that goes through the Ge emulation for portability. To be used for things like sceUtility* and other overlays like FPS and stats. --- .gitignore | 1 + Common/Common.vcxproj | 3 + Common/Common.vcxproj.filters | 3 + Common/Thread.cpp | 2 +- Core/CMakeLists.txt | 2 + Core/Core.vcxproj | 4 + Core/Core.vcxproj.filters | 12 + Core/HLE/sceDisplay.cpp | 11 + Core/HLE/sceGe.cpp | 40 +++- Core/HLE/sceGe.h | 7 + Core/HLE/sceImpose.cpp | 6 +- Core/HLE/sceKernel.cpp | 7 + Core/HLE/sceUtility.cpp | 21 +- Core/Util/PPGeDraw.cpp | 331 ++++++++++++++++++++++++++++ Core/Util/PPGeDraw.h | 65 ++++++ Core/Util/ppge_atlas.cpp | 125 +++++++++++ Core/Util/ppge_atlas.h | 20 ++ GPU/GLES/DisplayListInterpreter.cpp | 85 ++++--- GPU/GLES/DisplayListInterpreter.h | 5 + GPU/GLES/Framebuffer.cpp | 3 +- GPU/GLES/ShaderManager.cpp | 3 + GPU/GLES/ShaderManager.h | 3 +- GPU/GLES/TextureCache.cpp | 4 +- GPU/GLES/TransformPipeline.cpp | 24 +- GPU/GLES/VertexDecoder.cpp | 20 +- GPU/GPUInterface.h | 3 + GPU/GPUState.cpp | 31 ++- GPU/GPUState.h | 37 +++- GPU/Null/NullGpu.cpp | 77 ++++--- GPU/Null/NullGpu.h | 5 + SDL/buildassets.sh | 1 + Windows/PPSSPP.vcxproj | 5 +- android/assets/ppge_atlas.zim | Bin 0 -> 131088 bytes android/buildassets.sh | 1 + android/jni/Android.mk | 5 +- build_ppgeatlas.sh | 1 + main.cpp | 2 +- ppge_atlas.zim | Bin 0 -> 131088 bytes ppge_atlasscript.txt | 8 + 39 files changed, 847 insertions(+), 136 deletions(-) create mode 100644 Core/Util/PPGeDraw.cpp create mode 100644 Core/Util/PPGeDraw.h create mode 100644 Core/Util/ppge_atlas.cpp create mode 100644 Core/Util/ppge_atlas.h create mode 100644 android/assets/ppge_atlas.zim create mode 100644 build_ppgeatlas.sh create mode 100644 ppge_atlas.zim create mode 100644 ppge_atlasscript.txt diff --git a/.gitignore b/.gitignore index 71e7b81344..f2e96b314a 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ Memstick android/ui_atlas.zim __testoutput.txt __testerror.txt +ppge_atlas.zim.png diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj index 85d3a82b1e..e7db622210 100644 --- a/Common/Common.vcxproj +++ b/Common/Common.vcxproj @@ -245,6 +245,9 @@ + + + diff --git a/Common/Common.vcxproj.filters b/Common/Common.vcxproj.filters index 14140af678..c55369f88c 100644 --- a/Common/Common.vcxproj.filters +++ b/Common/Common.vcxproj.filters @@ -77,4 +77,7 @@ + + + \ No newline at end of file diff --git a/Common/Thread.cpp b/Common/Thread.cpp index f3dc162574..77815bfb27 100644 --- a/Common/Thread.cpp +++ b/Common/Thread.cpp @@ -129,7 +129,7 @@ void SetThreadAffinity(std::thread::native_handle_type thread, u32 mask) #ifdef __APPLE__ thread_policy_set(pthread_mach_thread_np(thread), THREAD_AFFINITY_POLICY, (integer_t *)&mask, 1); -#elif defined __linux__ || defined BSD4_4 +#elif (defined __linux__ || defined BSD4_4) && !defined(ANDROID) cpu_set_t cpu_set; CPU_ZERO(&cpu_set); diff --git a/Core/CMakeLists.txt b/Core/CMakeLists.txt index bbf5e38704..a8aac2e573 100644 --- a/Core/CMakeLists.txt +++ b/Core/CMakeLists.txt @@ -54,6 +54,8 @@ set(SRCS FileSystems/DirectoryFileSystem.cpp FileSystems/MetaFileSystem.cpp Util/BlockAllocator.cpp + Util/ppge_atlas.cpp + Util/PPGeDraw.cpp CPU.cpp CoreTiming.cpp Config.cpp diff --git a/Core/Core.vcxproj b/Core/Core.vcxproj index 426a12c298..a11d944332 100644 --- a/Core/Core.vcxproj +++ b/Core/Core.vcxproj @@ -236,6 +236,8 @@ + + @@ -337,6 +339,8 @@ + + diff --git a/Core/Core.vcxproj.filters b/Core/Core.vcxproj.filters index a29237c2a8..0d1ff26051 100644 --- a/Core/Core.vcxproj.filters +++ b/Core/Core.vcxproj.filters @@ -291,6 +291,12 @@ HLE\Libraries + + Util + + + Util + @@ -530,6 +536,12 @@ HLE\Libraries + + Util + + + Util + diff --git a/Core/HLE/sceDisplay.cpp b/Core/HLE/sceDisplay.cpp index f5af289bd3..35ccc4d707 100644 --- a/Core/HLE/sceDisplay.cpp +++ b/Core/HLE/sceDisplay.cpp @@ -47,6 +47,9 @@ #include "../../GPU/GLES/ShaderManager.h" #include "../../GPU/GPUState.h" +// Internal drawing library +#include "../Util/PPGeDraw.h" + extern ShaderManager shaderManager; struct FrameBufferState @@ -138,6 +141,14 @@ void hleEnterVblank(u64 userdata, int cyclesLate) framebufIsLatched = false; } + // Draw screen overlays before blitting. Saves and restores the Ge context. + + /* + PPGeBegin(); + PPGeDrawImage(I_LOGO, 5, 5, 0, 0xFFFFFFFF); + PPGeDrawText("This is PPGeDraw speaking", 10, 100, 0, 0.5f, 0xFFFFFFFF); + PPGeEnd(); + */ // Yeah, this has to be the right moment to end the frame. Should possibly blit the right buffer // depending on what's set in sceDisplaySetFramebuf, in order to support half-framerate games - // an initial hack could be to NOT end the frame if the buffer didn't change? that should work okay. diff --git a/Core/HLE/sceGe.cpp b/Core/HLE/sceGe.cpp index 9e4e475a73..082a6dd4a5 100644 --- a/Core/HLE/sceGe.cpp +++ b/Core/HLE/sceGe.cpp @@ -154,14 +154,42 @@ void sceGeUnsetCallback(u32 cbID) sceKernelReleaseSubIntrHandler(PSP_GE_INTR, PSP_GE_SUBINTR_SIGNAL); } -void sceGeSaveContext() +// Points to 512 32-bit words, where we can probably layout the context however we want +// unless some insane game pokes it and relies on it... +u32 sceGeSaveContext(u32 ctxAddr) { - ERROR_LOG(HLE,"UNIMPL sceGeSaveContext()"); + DEBUG_LOG(HLE,"sceGeSaveContext(%08x)", ctxAddr); + + if (sizeof(gstate) > 512 * 4) { + ERROR_LOG(HLE, "AARGH! sizeof(gstate) has grown too large!"); + return 0; + } + + // Let's just dump gstate. + if (Memory::IsValidAddress(ctxAddr)) { + Memory::WriteStruct(ctxAddr, &gstate); + } + + // This action should probably be pushed to the end of the queue of the display thread - + // when we have one. + return 0; } -void sceGeRestoreContext() +u32 sceGeRestoreContext(u32 ctxAddr) { - ERROR_LOG(HLE,"UNIMPL sceGeRestoreContext()"); + DEBUG_LOG(HLE,"sceGeRestoreContext(%08x)", ctxAddr); + + if (sizeof(gstate) > 512 * 4) { + ERROR_LOG(HLE, "AARGH! sizeof(gstate) has grown too large!"); + return 0; + } + + if (Memory::IsValidAddress(ctxAddr)) { + Memory::ReadStruct(ctxAddr, &gstate); + } + ReapplyGfxState(); + + return 0; } void sceGeGetMtx() @@ -195,8 +223,8 @@ const HLEFunction sceGe_user[] = {0xB77905EA,&sceGeEdramSetAddrTranslation,"sceGeEdramSetAddrTranslation"}, {0xDC93CFEF,0,"sceGeGetCmd"}, {0x57C8945B,&sceGeGetMtx,"sceGeGetMtx"}, - {0x438A385A,0,"sceGeSaveContext"}, - {0x0BF608FB,0,"sceGeRestoreContext"}, + {0x438A385A,&WrapU_U,"sceGeSaveContext"}, + {0x0BF608FB,&WrapU_U,"sceGeRestoreContext"}, {0x5FB86AB0,0,"sceGeListDeQueue"}, }; diff --git a/Core/HLE/sceGe.h b/Core/HLE/sceGe.h index 9a418743c7..7b92c863b8 100644 --- a/Core/HLE/sceGe.h +++ b/Core/HLE/sceGe.h @@ -38,3 +38,10 @@ void Register_sceGe_user(); void __GeInit(); void __GeShutdown(); + + +// Export functions for use by Util/PPGe +u32 sceGeRestoreContext(u32 ctxAddr); +u32 sceGeSaveContext(u32 ctxAddr); + +u32 sceGeListEnQueue(u32 listAddress, u32 stallAddress, u32 callbackId, u32 optParamAddr); diff --git a/Core/HLE/sceImpose.cpp b/Core/HLE/sceImpose.cpp index d37ac1f171..93a417a088 100644 --- a/Core/HLE/sceImpose.cpp +++ b/Core/HLE/sceImpose.cpp @@ -39,7 +39,7 @@ static u32 iButtonValue = 0; u32 sceImposeGetBatteryIconStatus(u32 chargingPtr, u32 iconStatusPtr) { - DEBUG_LOG(HLE,"%i=sceImposeGetBatteryIconStatus(%08x, %08x)", chargingPtr, iconStatusPtr); + DEBUG_LOG(HLE, "sceImposeGetBatteryIconStatus(%08x, %08x)", chargingPtr, iconStatusPtr); if (Memory::IsValidAddress(chargingPtr)) Memory::Write_U32(1, chargingPtr); if (Memory::IsValidAddress(iconStatusPtr)) @@ -49,7 +49,7 @@ u32 sceImposeGetBatteryIconStatus(u32 chargingPtr, u32 iconStatusPtr) u32 sceImposeSetLanguageMode(u32 languageVal, u32 buttonVal) { - DEBUG_LOG(HLE,"%i=sceImposeSetLanguageMode(%08x, %08x)", languageVal, buttonVal); + DEBUG_LOG(HLE, "sceImposeSetLanguageMode(%08x, %08x)", languageVal, buttonVal); iLanguage = languageVal; iButtonValue = buttonVal; return 0; @@ -57,7 +57,7 @@ u32 sceImposeSetLanguageMode(u32 languageVal, u32 buttonVal) u32 sceImposeGetLanguageMode(u32 languagePtr, u32 btnPtr) { - DEBUG_LOG(HLE,"%i=sceImposeGetLanguageMode(%08x, %08x)", languagePtr, btnPtr); + DEBUG_LOG(HLE, "sceImposeGetLanguageMode(%08x, %08x)", languagePtr, btnPtr); if (Memory::IsValidAddress(languagePtr)) Memory::Write_U32(iLanguage, languagePtr); if (Memory::IsValidAddress(btnPtr)) diff --git a/Core/HLE/sceKernel.cpp b/Core/HLE/sceKernel.cpp index c466ce63ad..37f54cec7d 100644 --- a/Core/HLE/sceKernel.cpp +++ b/Core/HLE/sceKernel.cpp @@ -49,6 +49,8 @@ #include "sceUtility.h" #include "sceUmd.h" +#include "../Util/PPGeDraw.h" + extern MetaFileSystem pspFileSystem; /* @@ -78,6 +80,9 @@ void __KernelInit() __PowerInit(); __UtilityInit(); __UmdInit(); + + // "Internal" PSP libraries + __PPGeInit(); kernelRunning = true; INFO_LOG(HLE, "Kernel initialized."); @@ -94,6 +99,8 @@ void __KernelShutdown() INFO_LOG(HLE, "Shutting down kernel - %i kernel objects alive", kernelObjects.GetCount()); kernelObjects.Clear(); + __PPGeShutdown(); + __GeShutdown(); __AudioShutdown(); __IoShutdown(); diff --git a/Core/HLE/sceUtility.cpp b/Core/HLE/sceUtility.cpp index 7dec4ae316..d3b50a28a0 100644 --- a/Core/HLE/sceUtility.cpp +++ b/Core/HLE/sceUtility.cpp @@ -22,6 +22,8 @@ #include "sceKernelThread.h" #include "sceUtility.h" +#include "sceCtrl.h" +#include "../Util/PPGeDraw.h" enum SceUtilitySavedataType { @@ -288,17 +290,20 @@ struct pspMessageDialog u32 buttonPressed; // 0=?, 1=Yes, 2=No, 3=Back }; +static pspMessageDialog messageDialog; + void sceUtilityMsgDialogInitStart() { - DEBUG_LOG(HLE,"FAKE sceUtilityMsgDialogInitStart(%i)", PARAM(0)); - pspMessageDialog *dlg = (pspMessageDialog *)Memory::GetPointer(PARAM(0)); - if (dlg->type == 0) // number + u32 structAddr = PARAM(0); + DEBUG_LOG(HLE,"FAKE sceUtilityMsgDialogInitStart(%i)", structAddr); + Memory::ReadStruct(structAddr, &messageDialog); + if (messageDialog.type == 0) // number { - INFO_LOG(HLE, "MsgDialog: %08x", dlg->errorNum); + INFO_LOG(HLE, "MsgDialog: %08x", messageDialog.errorNum); } else { - INFO_LOG(HLE, "MsgDialog: %s", dlg->string); + INFO_LOG(HLE, "MsgDialog: %s", messageDialog.string); } __UtilityInitStart(); } @@ -314,6 +319,9 @@ void sceUtilityMsgDialogUpdate() { DEBUG_LOG(HLE,"FAKE sceUtilityMsgDialogUpdate(%i)", PARAM(0)); __UtilityUpdate(); + // PPGeBegin(); + + // PPGeEnd(); RETURN(0); } @@ -323,6 +331,9 @@ void sceUtilityMsgDialogGetStatus() RETURN(__UtilityGetStatus()); } + +// On screen keyboard + void sceUtilityOskInitStart() { DEBUG_LOG(HLE,"FAKE sceUtilityOskInitStart(%i)", PARAM(0)); diff --git a/Core/Util/PPGeDraw.cpp b/Core/Util/PPGeDraw.cpp new file mode 100644 index 0000000000..a125470646 --- /dev/null +++ b/Core/Util/PPGeDraw.cpp @@ -0,0 +1,331 @@ +// Copyright (c) 2012- PPSSPP Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0 or later versions. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official git repository and contact information can be found at +// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. + +#include "PPGeDraw.h" +#include "../GPU/ge_constants.h" +#include "../GPU/GPUState.h" +#include "../GPU/GPUInterface.h" +#include "../HLE/sceKernel.h" +#include "../HLE/sceKernelMemory.h" +#include "../HLE/sceGe.h" +#include "../MemMap.h" +#include "image/zim_load.h" +#include "gfx/texture_atlas.h" +#include "../System.h" + +static u32 atlasPtr; + +struct PPGeVertex { + u16 u, v; + u32 color; + s16 x, y; u16 z; +}; + +u32 savedContextPtr; +u32 savedContextSize = 512 * 4; + +// Display list writer +u32 dlPtr; +u32 dlWritePtr; +u32 dlSize = 0x10000; // should be enough for a frame of gui... + +u32 dataPtr; +u32 dataWritePtr; +u32 dataSize = 0x10000; // should be enough for a frame of gui... + +// Vertex collector +u32 vertexStart; +u32 vertexCount; + +//only 0xFFFFFF of data is used +static void WriteCmd(u8 cmd, u32 data) { + Memory::Write_U32((cmd << 24) | (data & 0xFFFFFF), dlWritePtr); + dlWritePtr += 4; +} + +static void WriteCmdAddrWithBase(u8 cmd, u32 addr) { + WriteCmd(GE_CMD_BASE, (addr >> 8) & 0xFF0000); + WriteCmd(cmd, addr & 0xFFFFFF); +} + +/* +static void WriteCmdFloat(u8 cmd, float f) { + union { + float fl; + u32 u; + } conv; + conv.fl = f; + WriteCmd(cmd, conv.u >> 8); +}*/ + +static void BeginVertexData() { + vertexCount = 0; + vertexStart = dataWritePtr; +} + +static void Vertex(float x, float y, float u, float v, u32 color = 0xFFFFFFFF) +{ + PPGeVertex vtx; + vtx.x = x - 0.5f; vtx.y = y - 0.5f; vtx.z = 0; + vtx.u = u * 256 - 0.5f; vtx.v = v * 256 - 0.5f; + vtx.color = color; + Memory::WriteStruct(dataWritePtr, &vtx); + vertexCount++; + dataWritePtr += sizeof(vtx); +} + +static void EndVertexDataAndDraw(int prim) { + WriteCmdAddrWithBase(GE_CMD_VADDR, vertexStart); + WriteCmd(GE_CMD_PRIM, (prim << 16) | vertexCount); +} + +void __PPGeInit() +{ + if (PSP_CoreParameter().gpuCore == GPU_NULL) { + // Let's just not bother. + dlPtr = 0; + NOTICE_LOG(HLE, "Not initializing PPGe - GPU is NullGpu"); + return; + } + u8 *imageData; + int width; + int height; + int flags; + if (!LoadZIM("ppge_atlas.zim", &width, &height, &flags, &imageData)) { + ERROR_LOG(HLE, "PPGe init failed - no atlas texture. PPGe stuff will not be drawn."); + return; + } + + u32 atlasSize = height * width * 2; // it's a 4444 texture + dlPtr = kernelMemory.Alloc(dlSize, false, "PPGe Display List"); + dataPtr = kernelMemory.Alloc(dataSize, false, "PPGe Vertex Data"); + atlasPtr = kernelMemory.Alloc(atlasSize, false, "PPGe Atlas Texture"); + savedContextPtr = kernelMemory.Alloc(savedContextSize, false, "PPGe Saved Context"); + + u16 *imagePtr = (u16 *)imageData; + // component order change + for (int i = 0; i < width * height; i++) { + u16 c = imagePtr[i]; + int a = c & 0xF; + int r = (c >> 4) & 0xF; + int g = (c >> 8) & 0xF; + int b = (c >> 12) & 0xF; + c = (a << 12) | (r << 8) | (g << 4) | b; + imagePtr[i] = c; + } + + Memory::Memcpy(atlasPtr, imageData, atlasSize); + free(imageData); + + NOTICE_LOG(HLE, "PPGe drawing library initialized. DL: %08x Data: %08x Atlas: %08x (%i) Ctx: %08x", + dlPtr, dataPtr, atlasPtr, atlasSize, savedContextPtr); +} + +void __PPGeShutdown() +{ + kernelMemory.Free(atlasPtr); + kernelMemory.Free(dataPtr); + kernelMemory.Free(dlPtr); + kernelMemory.Free(savedContextPtr); + atlasPtr = 0; + dataPtr = 0; + dlPtr = 0; + savedContextPtr = 0; +} + +void PPGeBegin() +{ + if (!dlPtr) + return; + + // Reset write pointers to start of command and data buffers. + dlWritePtr = dlPtr; + dataWritePtr = dataPtr; + + // Set up the correct states for UI drawing + WriteCmd(GE_CMD_ALPHABLENDENABLE, 1); + WriteCmd(GE_CMD_BLENDMODE, 2 | (3 << 4)); + WriteCmd(GE_CMD_ALPHATESTENABLE, 0); + WriteCmd(GE_CMD_COLORTESTENABLE, 0); + WriteCmd(GE_CMD_ZTESTENABLE, 0); + WriteCmd(GE_CMD_FOGENABLE, 0); + WriteCmd(GE_CMD_STENCILTESTENABLE, 0); + WriteCmd(GE_CMD_CULLFACEENABLE, 0); + WriteCmd(GE_CMD_CLEARMODE, 0); // Normal mode + + WriteCmd(GE_CMD_TEXTUREMAPENABLE, 1); + WriteCmd(GE_CMD_TEXSIZE0, 8 | (8 << 8)); // 1 << (7+1) = 256 + WriteCmd(GE_CMD_TEXMAPMODE, 0 | (1 << 8)); + WriteCmd(GE_CMD_TEXMODE, 0); + WriteCmd(GE_CMD_TEXFORMAT, 2); // 4444 + WriteCmd(GE_CMD_TEXFILTER, (1 << 8) | 1); // mag = LINEAR min = LINEAR + WriteCmd(GE_CMD_TEXWRAP, (1 << 8) | 1); // clamp texture wrapping + WriteCmd(GE_CMD_TEXFUNC, (0 << 16) | (1 << 8) | 0); // RGBA texture reads, modulate, no color doubling + WriteCmd(GE_CMD_TEXADDR0, atlasPtr & 0xFFFFF0); + WriteCmd(GE_CMD_TEXBUFWIDTH0, 256 | ((atlasPtr & 0xFF000000) >> 8)); + WriteCmd(GE_CMD_TEXFLUSH, 0); + + WriteCmd(GE_CMD_SCISSOR1, (0 << 10) | 0); + WriteCmd(GE_CMD_SCISSOR2, (1023 << 10) | 1023); + WriteCmd(GE_CMD_MINZ, 0); + WriteCmd(GE_CMD_MAXZ, 0xFFFF); + + // Through mode, so we don't have to bother with matrices + WriteCmd(GE_CMD_VERTEXTYPE, GE_VTYPE_TC_16BIT | GE_VTYPE_COL_8888 | GE_VTYPE_POS_16BIT | GE_VTYPE_THROUGH); +} + +void PPGeEnd() +{ + if (!dlPtr) + return; + + WriteCmd(GE_CMD_FINISH, 0); + WriteCmd(GE_CMD_END, 0); + + if (dataWritePtr > dataPtr) { + sceGeSaveContext(savedContextPtr); + gpu->EnableInterrupts(false); + + // We actually drew something + u32 list = sceGeListEnQueue(dlPtr, dlWritePtr, 0, 0); + DEBUG_LOG(HLE, "PPGe enqueued display list %i", list); + // TODO: Might need to call some internal trickery function when this is actually synchronous. + // sceGeListSync(u32 displayListID, 1); //0 : wait for completion 1:check and return + gpu->EnableInterrupts(true); + sceGeRestoreContext(savedContextPtr); + } + +} + +static void PPGeMeasureText(const char *text, float scale, float *w, float *h) { + const AtlasFont &atlasfont = *ppge_atlas.fonts[0]; + unsigned char cval; + float wacc = 0; + int lines = 1; + while ((cval = *text++) != '\0') { + if (cval < 32) continue; + if (cval > 127) continue; + if (cval == '\n') { + wacc = 0; + lines++; + } + AtlasChar c = atlasfont.chars[cval - 32]; + wacc += c.wx * scale; + } + if (w) *w = wacc; + if (h) *h = atlasfont.height * scale * lines; +} + +static void PPGeDoAlign(int flags, float *x, float *y, float *w, float *h) { + if (flags & PPGE_ALIGN_HCENTER) *x -= *w / 2; + if (flags & PPGE_ALIGN_RIGHT) *x -= *w; + if (flags & PPGE_ALIGN_VCENTER) *y -= *h / 2; + if (flags & PPGE_ALIGN_BOTTOM) *y -= *h; +} + +// Draws some text using the one font we have. +// Mostly stolen from DrawBuffer. +void PPGeDrawText(const char *text, float x, float y, int align, float scale, u32 color) +{ + if (!dlPtr) + return; + const AtlasFont &atlasfont = *ppge_atlas.fonts[0]; + unsigned char cval; + float w, h; + PPGeMeasureText(text, scale, &w, &h); + if (align) { + PPGeDoAlign(align, &x, &y, &w, &h); + } + BeginVertexData(); + y += atlasfont.ascend*scale; + float sx = x; + while ((cval = *text++) != '\0') { + if (cval == '\n') { + y += atlasfont.height * scale; + x = sx; + continue; + } + if (cval < 32) continue; + if (cval > 127) continue; + AtlasChar c = atlasfont.chars[cval - 32]; + float cx1 = x + c.ox * scale; + float cy1 = y + c.oy * scale; + float cx2 = x + (c.ox + c.pw) * scale; + float cy2 = y + (c.oy + c.ph) * scale; + Vertex(cx1, cy1, c.sx, c.sy, color); + Vertex(cx2, cy2, c.ex, c.ey, color); + x += c.wx * scale; + } + EndVertexDataAndDraw(GE_PRIM_RECTANGLES); +} + +// Draws a "4-patch" for button-like things that can be resized +void PPGeDraw4Patch(int atlasImage, float x, float y, float w, float h, u32 color) +{ + if (!dlPtr) + return; + const AtlasImage &img = ppge_images[atlasImage]; + float borderx = img.w / 2; + float bordery = img.h / 2; + float u1 = img.u1, uhalf = (img.u1 + img.u2) / 2, u2 = img.u2; + float v1 = img.v1, vhalf = (img.v1 + img.v2) / 2, v2 = img.v2; + float xmid1 = x + borderx; + float xmid2 = x + w - borderx; + float ymid1 = y + bordery; + float ymid2 = y + h - bordery; + float x2 = x + w; + float y2 = y + h; + BeginVertexData(); + // Top row + Vertex(x, y, u1, v1, color); + Vertex(xmid1, ymid1, uhalf, vhalf, color); + Vertex(xmid1, y, uhalf, v1, color); + Vertex(xmid2, ymid1, uhalf, vhalf, color); + Vertex(xmid2, y, uhalf, v1, color); + Vertex(x2, ymid1, u2, vhalf, color); + // Middle row + Vertex(x, ymid1, u1, vhalf, color); + Vertex(xmid1, ymid2, uhalf, vhalf, color); + Vertex(xmid1, ymid1, uhalf, vhalf, color); + Vertex(xmid2, ymid2, uhalf, vhalf, color); + Vertex(xmid2, ymid1, uhalf, vhalf, color); + Vertex(x2, ymid2, u2, v2, color); + // Bottom row + Vertex(x, ymid2, u1, vhalf, color); + Vertex(xmid1, y2, uhalf, v2, color); + Vertex(xmid1, ymid2, uhalf, vhalf, color); + Vertex(xmid2, y2, uhalf, v2, color); + Vertex(xmid2, ymid2, uhalf, vhalf, color); + Vertex(x2, y2, u2, v2, color); + EndVertexDataAndDraw(GE_PRIM_RECTANGLES); +} + +// Just blits an image to the screen, multiplied with the color. +void PPGeDrawImage(int atlasImage, float x, float y, int align, u32 color) +{ + if (!dlPtr) + return; + + const AtlasImage &img = ppge_atlas.images[atlasImage]; + float w = img.w; + float h = img.h; + BeginVertexData(); + Vertex(x, y, img.u1, img.v1, color); + Vertex(x + w, y + h, img.u2, img.v2, color); + EndVertexDataAndDraw(GE_PRIM_RECTANGLES); +} + diff --git a/Core/Util/PPGeDraw.h b/Core/Util/PPGeDraw.h new file mode 100644 index 0000000000..70018ba867 --- /dev/null +++ b/Core/Util/PPGeDraw.h @@ -0,0 +1,65 @@ +// Copyright (c) 2012- PPSSPP Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0 or later versions. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official git repository and contact information can be found at +// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. + +#pragma once + +#include "../../Globals.h" +#include "ppge_atlas.h" + +///////////////////////////////////////////////////////////////////////////////////////////// +// PPGeDraw: Super simple internal drawing API for 2D overlays like sceUtility messageboxes +// etc. Goes through the Ge emulation so that it's 100% portable - will work +// splendidly on any existing GPU backend, including the future software backend. + +// Uploads the necessary texture atlas and other data to kernel RAM, and reserves +// space for the display list. The PSP must be inited. +void __PPGeInit(); + +// Just frees up the allocated kernel memory. +void __PPGeShutdown(); + +// Save and restore the Ge context. PPGeEnd() kicks off the generated display list. +void PPGeBegin(); +void PPGeEnd(); + +enum { + PPGE_ALIGN_LEFT = 0, + PPGE_ALIGN_RIGHT = 16, + PPGE_ALIGN_TOP = 0, + PPGE_ALIGN_BOTTOM = 1, + PPGE_ALIGN_HCENTER = 4, + PPGE_ALIGN_VCENTER = 8, + PPGE_ALIGN_VBASELINE = 32, // text only, possibly not yet working + + PPGE_ALIGN_CENTER = PPGE_ALIGN_HCENTER | PPGE_ALIGN_VCENTER, + PPGE_ALIGN_TOPLEFT = PPGE_ALIGN_TOP | PPGE_ALIGN_LEFT, + PPGE_ALIGN_TOPRIGHT = PPGE_ALIGN_TOP | PPGE_ALIGN_RIGHT, + PPGE_ALIGN_BOTTOMLEFT = PPGE_ALIGN_BOTTOM | PPGE_ALIGN_LEFT, + PPGE_ALIGN_BOTTOMRIGHT = PPGE_ALIGN_BOTTOM | PPGE_ALIGN_RIGHT, +}; + +// These functions must be called between PPGeBegin and PPGeEnd. + +// Draws some text using the one font we have. +void PPGeDrawText(const char *text, float x, float y, int align, float scale, u32 color); + +// Draws a "4-patch" for button-like things that can be resized +void PPGeDraw4Patch(int atlasImage, float x, float y, float w, float h, u32 color); + +// Just blits an image to the screen, multiplied with the color. +void PPGeDrawImage(int atlasImage, float x, float y, int align, u32 color); + diff --git a/Core/Util/ppge_atlas.cpp b/Core/Util/ppge_atlas.cpp new file mode 100644 index 0000000000..7a8bf0fde9 --- /dev/null +++ b/Core/Util/ppge_atlas.cpp @@ -0,0 +1,125 @@ +// C++ generated by atlastool from ppge_atlasscript.txt (hrydgard@gmail.com) + +#include "ppge_atlas.h" + +const AtlasFont font_UBUNTU24 = { + -1.375000f, // padding + 36.687500f, // height + 26.937500f, // ascend + 0.750000f, // distslope + { + {0.972656f, 0.000000f, 0.976563f, 0.003906f, -2.0000f, -2.0000f, 7.0625f, 1, 1}, // 32 + {0.531250f, 0.675781f, 0.562500f, 0.777344f, -0.3750f, -23.1250f, 6.3750f, 8, 26}, // 33 + {0.246094f, 0.718750f, 0.292969f, 0.765625f, -0.5000f, -23.0625f, 10.2500f, 12, 12}, // 34 + {0.000000f, 0.191406f, 0.074219f, 0.292969f, -1.5625f, -23.0625f, 15.3125f, 19, 26}, // 35 + {0.527344f, 0.464844f, 0.589844f, 0.566406f, -1.1875f, -23.0625f, 13.8125f, 16, 26}, // 36 + {0.867188f, 0.105469f, 0.957031f, 0.207031f, -0.7500f, -23.3750f, 20.9375f, 23, 26}, // 37 + {0.000000f, 0.296875f, 0.066406f, 0.398438f, -0.9375f, -23.0625f, 14.1250f, 17, 26}, // 38 + {0.656250f, 0.140625f, 0.683594f, 0.187500f, -0.5000f, -23.0625f, 5.3125f, 7, 12}, // 39 + {0.425781f, 0.449219f, 0.472656f, 0.589844f, 0.3750f, -26.9375f, 10.7500f, 12, 36}, // 40 + {0.703125f, 0.453125f, 0.750000f, 0.593750f, -1.3750f, -26.9375f, 10.7500f, 12, 36}, // 41 + {0.933594f, 0.691406f, 0.996094f, 0.750000f, -1.2500f, -23.0625f, 12.8750f, 16, 15}, // 42 + {0.867188f, 0.691406f, 0.929688f, 0.753906f, -0.5000f, -18.3750f, 14.7500f, 16, 16}, // 43 + {0.593750f, 0.464844f, 0.625000f, 0.511719f, -0.5000f, -4.9375f, 5.7500f, 8, 12}, // 44 + {0.148438f, 0.191406f, 0.187500f, 0.214844f, -1.4375f, -12.6250f, 7.1250f, 10, 6}, // 45 + {0.421875f, 0.316406f, 0.453125f, 0.343750f, -0.5000f, -4.9375f, 6.1250f, 8, 7}, // 46 + {0.363281f, 0.421875f, 0.421875f, 0.535156f, -3.0625f, -23.0625f, 9.1250f, 15, 29}, // 47 + {0.070313f, 0.304688f, 0.136719f, 0.406250f, -0.7500f, -23.0625f, 15.4375f, 17, 26}, // 48 + {0.960938f, 0.105469f, 0.996094f, 0.207031f, -1.7500f, -23.0625f, 6.6250f, 9, 26}, // 49 + {0.781250f, 0.312500f, 0.847656f, 0.414063f, -0.8125f, -23.0625f, 14.3750f, 17, 26}, // 50 + {0.820313f, 0.527344f, 0.878906f, 0.628906f, -1.1875f, -23.0625f, 12.8750f, 15, 26}, // 51 + {0.406250f, 0.210938f, 0.476563f, 0.312500f, -1.6250f, -23.0625f, 13.8125f, 18, 26}, // 52 + {0.351563f, 0.316406f, 0.417969f, 0.417969f, -0.7500f, -23.0625f, 14.8750f, 17, 26}, // 53 + {0.628906f, 0.316406f, 0.695313f, 0.417969f, -0.7500f, -23.0625f, 14.9375f, 17, 26}, // 54 + {0.000000f, 0.507813f, 0.062500f, 0.609375f, -1.5000f, -23.0625f, 12.1250f, 16, 26}, // 55 + {0.859375f, 0.210938f, 0.929688f, 0.312500f, -0.8750f, -23.0625f, 15.5625f, 18, 26}, // 56 + {0.851563f, 0.316406f, 0.917969f, 0.417969f, -0.8750f, -23.0625f, 15.0000f, 17, 26}, // 57 + {0.660156f, 0.527344f, 0.691406f, 0.597656f, -0.3125f, -15.4375f, 6.5625f, 8, 18}, // 58 + {0.277344f, 0.128906f, 0.308594f, 0.218750f, -0.3125f, -15.4375f, 6.5625f, 8, 23}, // 59 + {0.335938f, 0.644531f, 0.398438f, 0.714844f, -0.5000f, -19.5000f, 14.7500f, 16, 18}, // 60 + {0.035156f, 0.707031f, 0.097656f, 0.753906f, -0.5000f, -16.3750f, 14.7500f, 16, 12}, // 61 + {0.660156f, 0.683594f, 0.722656f, 0.753906f, -0.5000f, -19.5000f, 14.7500f, 16, 18}, // 62 + {0.066406f, 0.515625f, 0.128906f, 0.617188f, -1.7500f, -23.0625f, 12.3750f, 16, 26}, // 63 + {0.191406f, 0.128906f, 0.273438f, 0.222656f, -0.8750f, -19.5625f, 18.5000f, 21, 24}, // 64 + {0.277344f, 0.222656f, 0.347656f, 0.324219f, -1.8125f, -23.0625f, 14.1875f, 18, 26}, // 65 + {0.222656f, 0.328125f, 0.289063f, 0.429688f, -0.5000f, -23.0625f, 15.0625f, 17, 26}, // 66 + {0.203125f, 0.539063f, 0.261719f, 0.640625f, -0.7500f, -23.0625f, 12.6875f, 15, 26}, // 67 + {0.140625f, 0.332031f, 0.207031f, 0.433594f, -0.5000f, -23.0625f, 15.5000f, 17, 26}, // 68 + {0.347656f, 0.539063f, 0.406250f, 0.640625f, -0.5000f, -23.0625f, 12.8750f, 15, 26}, // 69 + {0.132813f, 0.554688f, 0.191406f, 0.656250f, -0.5000f, -23.0625f, 11.8750f, 15, 26}, // 70 + {0.421875f, 0.343750f, 0.488281f, 0.445313f, -0.7500f, -23.0625f, 15.2500f, 17, 26}, // 71 + {0.699219f, 0.347656f, 0.765625f, 0.449219f, -0.5000f, -23.0625f, 15.8750f, 17, 26}, // 72 + {0.402344f, 0.695313f, 0.433594f, 0.796875f, -0.4375f, -23.0625f, 6.2500f, 8, 26}, // 73 + {0.527344f, 0.570313f, 0.585938f, 0.671875f, -1.7500f, -23.0625f, 11.8125f, 15, 26}, // 74 + {0.921875f, 0.355469f, 0.988281f, 0.457031f, -0.5000f, -23.0625f, 14.5000f, 17, 26}, // 75 + {0.222656f, 0.226563f, 0.277344f, 0.328125f, -0.5000f, -23.0625f, 11.1875f, 14, 26}, // 76 + {0.320313f, 0.117188f, 0.402344f, 0.218750f, -0.5000f, -23.0625f, 19.7500f, 21, 26}, // 77 + {0.492188f, 0.359375f, 0.558594f, 0.460938f, -0.5625f, -23.0625f, 15.8125f, 17, 26}, // 78 + {0.148438f, 0.226563f, 0.218750f, 0.328125f, -0.7500f, -23.0625f, 16.1250f, 18, 26}, // 79 + {0.562500f, 0.359375f, 0.628906f, 0.460938f, -0.5000f, -23.0625f, 14.5625f, 17, 26}, // 80 + {0.507813f, 0.125000f, 0.578125f, 0.234375f, -0.7500f, -23.0625f, 16.3125f, 18, 28}, // 81 + {0.000000f, 0.402344f, 0.066406f, 0.503906f, -0.5000f, -23.0625f, 15.4375f, 17, 26}, // 82 + {0.070313f, 0.410156f, 0.136719f, 0.511719f, -1.3125f, -23.0625f, 13.6875f, 17, 26}, // 83 + {0.753906f, 0.523438f, 0.816406f, 0.625000f, -1.7500f, -23.0625f, 12.3125f, 16, 26}, // 84 + {0.480469f, 0.238281f, 0.550781f, 0.339844f, -0.6250f, -23.0625f, 16.3125f, 18, 26}, // 85 + {0.554688f, 0.253906f, 0.625000f, 0.355469f, -1.8125f, -23.0625f, 13.8125f, 18, 26}, // 86 + {0.867188f, 0.000000f, 0.968750f, 0.101563f, -1.7500f, -23.0625f, 22.2500f, 26, 26}, // 87 + {0.769531f, 0.417969f, 0.835938f, 0.519531f, -1.5625f, -23.0625f, 13.5625f, 17, 26}, // 88 + {0.292969f, 0.421875f, 0.359375f, 0.523438f, -1.9375f, -23.0625f, 12.5625f, 17, 26}, // 89 + {0.281250f, 0.527344f, 0.343750f, 0.628906f, -1.0000f, -23.0625f, 13.0625f, 16, 26}, // 90 + {0.910156f, 0.460938f, 0.957031f, 0.601563f, 0.3750f, -26.9375f, 10.7500f, 12, 36}, // 91 + {0.140625f, 0.437500f, 0.199219f, 0.550781f, -2.0000f, -23.0625f, 9.1250f, 15, 29}, // 92 + {0.476563f, 0.464844f, 0.523438f, 0.605469f, -1.3750f, -26.9375f, 10.7500f, 12, 36}, // 93 + {0.726563f, 0.714844f, 0.781250f, 0.761719f, -1.1250f, -23.0625f, 11.4375f, 14, 12}, // 94 + {0.785156f, 0.718750f, 0.847656f, 0.742188f, -2.0000f, 0.0625f, 11.6250f, 16, 6}, // 95 + {0.566406f, 0.718750f, 0.617188f, 0.753906f, -0.5000f, -24.9375f, 11.9375f, 13, 9}, // 96 + {0.000000f, 0.613281f, 0.066406f, 0.695313f, -1.0000f, -18.6875f, 14.4375f, 17, 21}, // 97 + {0.632813f, 0.421875f, 0.699219f, 0.523438f, -0.5000f, -23.6875f, 15.3750f, 17, 26}, // 98 + {0.292969f, 0.328125f, 0.351563f, 0.410156f, -0.7500f, -18.6875f, 12.3750f, 15, 21}, // 99 + {0.839844f, 0.421875f, 0.906250f, 0.523438f, -0.7500f, -23.6875f, 15.3750f, 17, 26}, // 100 + {0.734375f, 0.628906f, 0.800781f, 0.710938f, -0.7500f, -18.6875f, 14.5000f, 17, 21}, // 101 + {0.136719f, 0.660156f, 0.179688f, 0.761719f, -0.5000f, -23.6875f, 8.1250f, 11, 26}, // 102 + {0.078125f, 0.191406f, 0.144531f, 0.300781f, -0.7500f, -18.6875f, 15.3750f, 17, 28}, // 103 + {0.210938f, 0.433594f, 0.277344f, 0.535156f, -0.5000f, -23.6875f, 15.6250f, 17, 26}, // 104 + {0.437500f, 0.695313f, 0.468750f, 0.796875f, -0.4375f, -23.6875f, 6.1875f, 8, 26}, // 105 + {0.484375f, 0.609375f, 0.527344f, 0.738281f, -3.3750f, -23.6875f, 6.6250f, 11, 33}, // 106 + {0.593750f, 0.527344f, 0.656250f, 0.628906f, -0.5000f, -23.6875f, 13.6250f, 16, 26}, // 107 + {0.000000f, 0.699219f, 0.031250f, 0.800781f, -0.5000f, -23.6875f, 6.0625f, 8, 26}, // 108 + {0.406250f, 0.125000f, 0.503906f, 0.207031f, -0.5000f, -18.6875f, 23.1875f, 25, 21}, // 109 + {0.265625f, 0.632813f, 0.332031f, 0.714844f, -0.5000f, -18.6875f, 15.6250f, 17, 21}, // 110 + {0.660156f, 0.597656f, 0.730469f, 0.679688f, -0.7500f, -18.6875f, 15.5625f, 18, 21}, // 111 + {0.789063f, 0.199219f, 0.855469f, 0.308594f, -0.5000f, -18.6875f, 15.3750f, 17, 28}, // 112 + {0.656250f, 0.203125f, 0.722656f, 0.312500f, -0.7500f, -18.6875f, 15.3750f, 17, 28}, // 113 + {0.351563f, 0.222656f, 0.398438f, 0.304688f, -0.6250f, -18.6875f, 9.6875f, 12, 21}, // 114 + {0.070313f, 0.621094f, 0.132813f, 0.703125f, -1.1250f, -18.6875f, 13.6250f, 16, 21}, // 115 + {0.195313f, 0.644531f, 0.242188f, 0.746094f, -0.6250f, -23.0625f, 8.9375f, 12, 26}, // 116 + {0.589844f, 0.632813f, 0.656250f, 0.714844f, -0.6250f, -18.6875f, 15.5000f, 17, 21}, // 117 + {0.882813f, 0.605469f, 0.953125f, 0.687500f, -1.7500f, -18.6875f, 14.3125f, 18, 21}, // 118 + {0.683594f, 0.117188f, 0.785156f, 0.199219f, -1.6875f, -18.6875f, 22.4375f, 26, 21}, // 119 + {0.410156f, 0.609375f, 0.480469f, 0.691406f, -1.7500f, -18.6875f, 13.8125f, 18, 21}, // 120 + {0.582031f, 0.140625f, 0.652344f, 0.250000f, -1.7500f, -18.6875f, 14.0000f, 18, 28}, // 121 + {0.804688f, 0.632813f, 0.863281f, 0.714844f, -1.0000f, -18.6875f, 12.7500f, 15, 21}, // 122 + {0.726563f, 0.203125f, 0.777344f, 0.343750f, -0.6875f, -26.9375f, 10.9375f, 13, 36}, // 123 + {0.960938f, 0.460938f, 0.988281f, 0.597656f, 0.6875f, -26.3125f, 7.9375f, 7, 35}, // 124 + {0.933594f, 0.210938f, 0.984375f, 0.351563f, -1.3750f, -26.9375f, 10.9375f, 13, 36}, // 125 + {0.296875f, 0.718750f, 0.359375f, 0.750000f, -0.5000f, -14.1875f, 14.7500f, 16, 8}, // 126 + {0.582031f, 0.000000f, 0.679688f, 0.136719f, -0.5000f, -25.2500f, 23.1250f, 25, 35}, // 127 + }, + "UBUNTU24", // name +}; +const AtlasFont *ppge_fonts[1] = { + &font_UBUNTU24, +}; +const AtlasImage ppge_images[6] = { + {0.458984f, 0.001953f, 0.576172f, 0.119141f, 31, 31, "I_CROSS"}, + {0.193359f, 0.001953f, 0.314453f, 0.123047f, 32, 32, "I_CIRCLE"}, + {0.685547f, 0.001953f, 0.794922f, 0.111328f, 29, 29, "I_SQUARE"}, + {0.322266f, 0.001953f, 0.451172f, 0.111328f, 34, 29, "I_TRIANGLE"}, + {0.802734f, 0.001953f, 0.861328f, 0.193359f, 16, 50, "I_BUTTON"}, + {0.001953f, 0.001953f, 0.185547f, 0.185547f, 48, 48, "I_LOGO"}, +}; +const Atlas ppge_atlas = { + "ppge_atlas.zim", + ppge_fonts, 1, + ppge_images, 6, +}; diff --git a/Core/Util/ppge_atlas.h b/Core/Util/ppge_atlas.h new file mode 100644 index 0000000000..0aa2a88fcf --- /dev/null +++ b/Core/Util/ppge_atlas.h @@ -0,0 +1,20 @@ +// Header generated by atlastool from ppge_atlasscript.txt (hrydgard@gmail.com) + +#pragma once +#include "gfx/texture_atlas.h" + +// FONTS_ppge +#define UBUNTU24 0 + + +// IMAGES_ppge +#define I_CROSS 0 +#define I_CIRCLE 1 +#define I_SQUARE 2 +#define I_TRIANGLE 3 +#define I_BUTTON 4 +#define I_LOGO 5 + + +extern const Atlas ppge_atlas; +extern const AtlasImage ppge_images[6]; diff --git a/GPU/GLES/DisplayListInterpreter.cpp b/GPU/GLES/DisplayListInterpreter.cpp index d927f94326..4e02d04609 100644 --- a/GPU/GLES/DisplayListInterpreter.cpp +++ b/GPU/GLES/DisplayListInterpreter.cpp @@ -160,7 +160,7 @@ void drawBezier(int ucount, int vcount) } LinkedShader *linkedShader = shaderManager.ApplyShader(); - TransformAndDrawPrim(Memory::GetPointer(gstate.vertexAddr), &indices[0], GE_PRIM_TRIANGLES, 3 * 3 * 6, linkedShader, customUV, GE_VTYPE_IDX_16BIT); + TransformAndDrawPrim(Memory::GetPointer(gstate_c.vertexAddr), &indices[0], GE_PRIM_TRIANGLES, 3 * 3 * 6, linkedShader, customUV, GE_VTYPE_IDX_16BIT); } @@ -256,17 +256,17 @@ void GLES_GPU::ExecuteOp(u32 op, u32 diff) switch (cmd) { case GE_CMD_BASE: - DEBUG_LOG(G3D,"DL BASE: %06x", data); + DEBUG_LOG(G3D,"DL BASE: %06x", data & 0xFFFFFF); break; case GE_CMD_VADDR: /// <<8???? - gstate.vertexAddr = ((gstate.base & 0x00FF0000) << 8)|data; - DEBUG_LOG(G3D,"DL VADDR: %06x", gstate.vertexAddr); + gstate_c.vertexAddr = ((gstate.base & 0x00FF0000) << 8)|data; + DEBUG_LOG(G3D,"DL VADDR: %06x", gstate_c.vertexAddr); break; case GE_CMD_IADDR: - gstate.indexAddr = ((gstate.base & 0x00FF0000) << 8)|data; - DEBUG_LOG(G3D,"DL IADDR: %06x", gstate.indexAddr); + gstate_c.indexAddr = ((gstate.base & 0x00FF0000) << 8)|data; + DEBUG_LOG(G3D,"DL IADDR: %06x", gstate_c.indexAddr); break; case GE_CMD_PRIM: @@ -282,15 +282,15 @@ void GLES_GPU::ExecuteOp(u32 op, u32 diff) "TRIANGLE_FAN=5,", "RECTANGLES=6,", }; - DEBUG_LOG(G3D, "DL DrawPrim type: %s count: %i vaddr= %08x, iaddr= %08x", type<7 ? types[type] : "INVALID", count, gstate.vertexAddr, gstate.indexAddr); + DEBUG_LOG(G3D, "DL DrawPrim type: %s count: %i vaddr= %08x, iaddr= %08x", type<7 ? types[type] : "INVALID", count, gstate_c.vertexAddr, gstate_c.indexAddr); LinkedShader *linkedShader = shaderManager.ApplyShader(); // TODO: Split this so that we can collect sequences of primitives, can greatly speed things up // on platforms where draw calls are expensive like mobile and D3D - void *verts = Memory::GetPointer(gstate.vertexAddr); + void *verts = Memory::GetPointer(gstate_c.vertexAddr); void *inds = 0; if ((gstate.vertType & GE_VTYPE_IDX_MASK) != GE_VTYPE_IDX_NONE) - inds = Memory::GetPointer(gstate.indexAddr); + inds = Memory::GetPointer(gstate_c.indexAddr); TransformAndDrawPrim(verts, inds, type, count, linkedShader); } break; @@ -349,7 +349,8 @@ void GLES_GPU::ExecuteOp(u32 op, u32 diff) int behaviour = (data >> 16) & 0xFF; int signal = data & 0xFFFF; - __TriggerInterruptWithArg(PSP_GE_INTR, PSP_GE_SUBINTR_SIGNAL, signal); + if (interruptsEnabled_) + __TriggerInterruptWithArg(PSP_GE_INTR, PSP_GE_SUBINTR_SIGNAL, signal); } break; @@ -389,7 +390,8 @@ void GLES_GPU::ExecuteOp(u32 op, u32 diff) case GE_CMD_FINISH: DEBUG_LOG(G3D,"DL CMD FINISH"); - __TriggerInterruptWithArg(PSP_GE_INTR, PSP_GE_SUBINTR_FINISH, 0); + if (interruptsEnabled_) + __TriggerInterruptWithArg(PSP_GE_INTR, PSP_GE_SUBINTR_FINISH, 0); break; case GE_CMD_END: @@ -407,7 +409,8 @@ void GLES_GPU::ExecuteOp(u32 op, u32 diff) } // This should generate a Reading Ended interrupt - // __TriggerInterrupt(PSP_GE_INTR); + // if (interruptsEnabled_) + // __TriggerInterrupt(PSP_GE_INTR); break; @@ -466,23 +469,23 @@ void GLES_GPU::ExecuteOp(u32 op, u32 diff) break; case GE_CMD_TEXSCALEU: - gstate.uScale = getFloat24(data); - DEBUG_LOG(G3D, "DL Texture U Scale: %f", gstate.uScale); + gstate_c.uScale = getFloat24(data); + DEBUG_LOG(G3D, "DL Texture U Scale: %f", gstate_c.uScale); break; case GE_CMD_TEXSCALEV: - gstate.vScale = getFloat24(data); - DEBUG_LOG(G3D, "DL Texture V Scale: %f", gstate.vScale); + gstate_c.vScale = getFloat24(data); + DEBUG_LOG(G3D, "DL Texture V Scale: %f", gstate_c.vScale); break; case GE_CMD_TEXOFFSETU: - gstate.uOff = getFloat24(data); - DEBUG_LOG(G3D, "DL Texture U Offset: %f", gstate.uOff); + gstate_c.uOff = getFloat24(data); + DEBUG_LOG(G3D, "DL Texture U Offset: %f", gstate_c.uOff); break; case GE_CMD_TEXOFFSETV: - gstate.vOff = getFloat24(data); - DEBUG_LOG(G3D, "DL Texture V Offset: %f", gstate.vOff); + gstate_c.vOff = getFloat24(data); + DEBUG_LOG(G3D, "DL Texture V Offset: %f", gstate_c.vOff); break; case GE_CMD_SCISSOR1: @@ -526,7 +529,7 @@ void GLES_GPU::ExecuteOp(u32 op, u32 diff) break; case GE_CMD_TEXADDR0: - gstate.textureChanged = true; + gstate_c.textureChanged = true; case GE_CMD_TEXADDR1: case GE_CMD_TEXADDR2: case GE_CMD_TEXADDR3: @@ -538,7 +541,7 @@ void GLES_GPU::ExecuteOp(u32 op, u32 diff) break; case GE_CMD_TEXBUFWIDTH0: - gstate.textureChanged = true; + gstate_c.textureChanged = true; case GE_CMD_TEXBUFWIDTH1: case GE_CMD_TEXBUFWIDTH2: case GE_CMD_TEXBUFWIDTH3: @@ -558,16 +561,12 @@ void GLES_GPU::ExecuteOp(u32 op, u32 diff) break; case GE_CMD_LOADCLUT: + // This could be used to "dirty" textures with clut. { - u32 clutAttr = ((gstate.clutaddrupper & 0xFF0000)<<8) | (gstate.clutaddr & 0xFFFFFF); - if (clutAttr) + u32 clutAddr = ((gstate.clutaddrupper & 0xFF0000)<<8) | (gstate.clutaddr & 0xFFFFFF); + if (clutAddr) { - u16 *clut = (u16*)Memory::GetPointer(clutAttr); - if (clut) { - int numColors = 16 * (data&0x3F); - memcpy(&gstate.paletteMem[0], clut, numColors * 2); - } - DEBUG_LOG(G3D,"DL Clut load: %i palettes", data); + DEBUG_LOG(G3D,"DL Clut load: %08x", clutAddr); } else { @@ -630,9 +629,9 @@ void GLES_GPU::ExecuteOp(u32 op, u32 diff) } case GE_CMD_TEXSIZE0: - gstate.textureChanged=true; - gstate.curTextureWidth = 1 << (gstate.texsize[0] & 0xf); - gstate.curTextureHeight = 1 << ((gstate.texsize[0]>>8) & 0xf); + gstate_c.textureChanged=true; + gstate_c.curTextureWidth = 1 << (gstate.texsize[0] & 0xf); + gstate_c.curTextureHeight = 1 << ((gstate.texsize[0]>>8) & 0xf); //fall thru - ignoring the mipmap sizes for now case GE_CMD_TEXSIZE1: case GE_CMD_TEXSIZE2: @@ -707,7 +706,7 @@ void GLES_GPU::ExecuteOp(u32 op, u32 diff) int c = n % 3; float val = getFloat24(data); DEBUG_LOG(G3D,"DL Light %i %c pos: %f", l, c+'X', val); - gstate.lightpos[l][c] = val; + gstate_c.lightpos[l][c] = val; } break; @@ -721,7 +720,7 @@ void GLES_GPU::ExecuteOp(u32 op, u32 diff) int c = n % 3; float val = getFloat24(data); DEBUG_LOG(G3D,"DL Light %i %c dir: %f", l, c+'X', val); - gstate.lightdir[l][c] = val; + gstate_c.lightdir[l][c] = val; } break; @@ -735,7 +734,7 @@ void GLES_GPU::ExecuteOp(u32 op, u32 diff) int c = n % 3; float val = getFloat24(data); DEBUG_LOG(G3D,"DL Light %i %c att: %f", l, c+'X', val); - gstate.lightatt[l][c] = val; + gstate_c.lightatt[l][c] = val; } break; @@ -750,9 +749,9 @@ void GLES_GPU::ExecuteOp(u32 op, u32 diff) int l = (cmd - GE_CMD_LAC0) / 3; int t = (cmd - GE_CMD_LAC0) % 3; - gstate.lightColor[t][l].r = r; - gstate.lightColor[t][l].g = g; - gstate.lightColor[t][l].b = b; + gstate_c.lightColor[t][l].r = r; + gstate_c.lightColor[t][l].g = g; + gstate_c.lightColor[t][l].b = b; } break; @@ -781,9 +780,9 @@ void GLES_GPU::ExecuteOp(u32 op, u32 diff) break; case GE_CMD_PATCHDIVISION: - gstate.patch_div_s = data & 0xFF; - gstate.patch_div_t = (data >> 8) & 0xFF; - DEBUG_LOG(G3D, "DL Patch subdivision: %i x %i", gstate.patch_div_s, gstate.patch_div_t); + gstate_c.patch_div_s = data & 0xFF; + gstate_c.patch_div_t = (data >> 8) & 0xFF; + DEBUG_LOG(G3D, "DL Patch subdivision: %i x %i", gstate_c.patch_div_s, gstate_c.patch_div_t); break; case GE_CMD_MATERIALUPDATE: @@ -908,7 +907,7 @@ void GLES_GPU::ExecuteOp(u32 op, u32 diff) int index = cmd - GE_CMD_MORPHWEIGHT0; float weight = getFloat24(data); DEBUG_LOG(G3D,"DL MorphWeight %i = %f", index, weight); - gstate.morphWeights[index] = weight; + gstate_c.morphWeights[index] = weight; } break; diff --git a/GPU/GLES/DisplayListInterpreter.h b/GPU/GLES/DisplayListInterpreter.h index 179655e519..6a67b42f19 100644 --- a/GPU/GLES/DisplayListInterpreter.h +++ b/GPU/GLES/DisplayListInterpreter.h @@ -24,11 +24,16 @@ class ShaderManager; class GLES_GPU : public GPUInterface { public: + GLES_GPU() : interruptsEnabled_(true) {} virtual u32 EnqueueList(u32 listpc, u32 stall); virtual void UpdateStall(int listid, u32 newstall); virtual void ExecuteOp(u32 op, u32 diff); virtual bool InterpretList(); virtual void DrawSync(int mode); + virtual void EnableInterrupts(bool enable) { + interruptsEnabled_ = enable; + } private: bool ProcessDLQueue(); + bool interruptsEnabled_; }; diff --git a/GPU/GLES/Framebuffer.cpp b/GPU/GLES/Framebuffer.cpp index d3477958a1..0caf6b5267 100644 --- a/GPU/GLES/Framebuffer.cpp +++ b/GPU/GLES/Framebuffer.cpp @@ -108,7 +108,8 @@ void DisplayDrawer_Init() glUniformMatrix4fv(draw2dprogram->u_viewproj, 1, GL_FALSE, ortho.getReadPtr()); glsl_unbind(); - // And an initial clear. + // And an initial clear. We don't clear per frame as the games are supposed to handle that + // by themselves. glClearColor(0, 0, 0, 0); glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); diff --git a/GPU/GLES/ShaderManager.cpp b/GPU/GLES/ShaderManager.cpp index ec0e375ec9..020e176596 100644 --- a/GPU/GLES/ShaderManager.cpp +++ b/GPU/GLES/ShaderManager.cpp @@ -37,6 +37,9 @@ #include "TransformPipeline.h" Shader::Shader(const char *code, uint32_t shaderType) { +#ifdef _DEBUG + source_ = code; +#endif #ifdef _WIN32 // OutputDebugString(code); #endif diff --git a/GPU/GLES/ShaderManager.h b/GPU/GLES/ShaderManager.h index d4709ee46b..674c949377 100644 --- a/GPU/GLES/ShaderManager.h +++ b/GPU/GLES/ShaderManager.h @@ -72,8 +72,9 @@ enum struct Shader { Shader(const char *code, uint32_t shaderType); - // const char *source; uint32_t shader; +private: + std::string source_; }; diff --git a/GPU/GLES/TextureCache.cpp b/GPU/GLES/TextureCache.cpp index 6cc852b6ce..90e4fa3cc7 100644 --- a/GPU/GLES/TextureCache.cpp +++ b/GPU/GLES/TextureCache.cpp @@ -579,8 +579,8 @@ void PSPSetTexture() u32 w = 1 << (gstate.texsize[0] & 0xf); u32 h = 1 << ((gstate.texsize[0]>>8) & 0xf); - gstate.curTextureHeight=h; - gstate.curTextureWidth=w; + gstate_c.curTextureWidth=w; + gstate_c.curTextureHeight=h; GLenum dstFmt = 0; u32 texByteAlign = 1; diff --git a/GPU/GLES/TransformPipeline.cpp b/GPU/GLES/TransformPipeline.cpp index ec3291ef23..05d84640e8 100644 --- a/GPU/GLES/TransformPipeline.cpp +++ b/GPU/GLES/TransformPipeline.cpp @@ -145,9 +145,9 @@ void Lighter::Light(float colorOut0[4], float colorOut1[4], const float colorIn[ Vec3 toLight; if (type == GE_LIGHTTYPE_DIRECTIONAL) - toLight = Vec3(gstate.lightpos[l]); // lightdir is for spotlights + toLight = Vec3(gstate_c.lightpos[l]); // lightdir is for spotlights else - toLight = Vec3(gstate.lightpos[l]) - pos; + toLight = Vec3(gstate_c.lightpos[l]) - pos; bool doSpecular = (comp != GE_LIGHTCOMP_ONLYDIFFUSE); bool poweredDiffuse = comp == GE_LIGHTCOMP_BOTHWITHPOWDIFFUSE; @@ -156,7 +156,7 @@ void Lighter::Light(float colorOut0[4], float colorOut1[4], const float colorIn[ if (type != GE_LIGHTTYPE_DIRECTIONAL) { float distance = toLight.Normalize(); - lightScale = 1.0f / (gstate.lightatt[l][0] + gstate.lightatt[l][1]*distance + gstate.lightatt[l][2]*distance*distance); + lightScale = 1.0f / (gstate_c.lightatt[l][0] + gstate_c.lightatt[l][1]*distance + gstate_c.lightatt[l][2]*distance*distance); if (lightScale > 1.0f) lightScale = 1.0f; } @@ -168,7 +168,7 @@ void Lighter::Light(float colorOut0[4], float colorOut1[4], const float colorIn[ if (poweredDiffuse) dot = powf(dot, specCoef_); - Color4 diff = (gstate.lightColor[1][l] * *diffuse) * (dot * lightScale); + Color4 diff = (gstate_c.lightColor[1][l] * *diffuse) * (dot * lightScale); // Real PSP specular Vec3 toViewer(0,0,1); @@ -184,13 +184,13 @@ void Lighter::Light(float colorOut0[4], float colorOut1[4], const float colorIn[ dot = halfVec * norm; if (dot >= 0) { - lightSum1 += (gstate.lightColor[2][l] * *specular * (powf(dot, specCoef_)*lightScale)); + lightSum1 += (gstate_c.lightColor[2][l] * *specular * (powf(dot, specCoef_)*lightScale)); } } dots[l] = dot; if (gstate.lightEnable[l] & 1) { - lightSum0 += gstate.lightColor[0][l] * *ambient + diff; + lightSum0 += gstate_c.lightColor[0][l] * *ambient + diff; } } @@ -216,9 +216,9 @@ void TransformAndDrawPrim(void *verts, void *inds, int prim, int vertexCount, Li bool useTexCoord = false; // Check if anything needs updating - if (gstate.textureChanged) + if (gstate_c.textureChanged) { - if (gstate.textureMapEnable && !(gstate.clearmode & 1)) + if ((gstate.textureMapEnable & 1) && !(gstate.clearmode & 1)) { PSPSetTexture(); useTexCoord = true; @@ -356,16 +356,16 @@ void TransformAndDrawPrim(void *verts, void *inds, int prim, int vertexCount, Li } if (customUV) { - uv[0] = customUV[index * 2 + 0]*gstate.uScale + gstate.uOff; - uv[1] = customUV[index * 2 + 1]*gstate.vScale + gstate.vOff; + uv[0] = customUV[index * 2 + 0]*gstate_c.uScale + gstate_c.uOff; + uv[1] = customUV[index * 2 + 1]*gstate_c.vScale + gstate_c.vOff; } else { // Perform texture coordinate generation after the transform and lighting - one style of UV depends on lights. switch (gstate.texmapmode & 0x3) { case 0: // UV mapping // Texture scale/offset is only performed in this mode. - uv[0] = decoded[index].uv[0]*gstate.uScale + gstate.uOff; - uv[1] = decoded[index].uv[1]*gstate.vScale + gstate.vOff; + uv[0] = decoded[index].uv[0]*gstate_c.uScale + gstate_c.uOff; + uv[1] = decoded[index].uv[1]*gstate_c.vScale + gstate_c.vOff; break; case 1: { diff --git a/GPU/GLES/VertexDecoder.cpp b/GPU/GLES/VertexDecoder.cpp index ef6104fd63..380567b1f5 100644 --- a/GPU/GLES/VertexDecoder.cpp +++ b/GPU/GLES/VertexDecoder.cpp @@ -121,8 +121,9 @@ void VertexDecoder::SetVertexType(u32 fmt) void VertexDecoder::DecodeVerts(DecodedVertex *decoded, const void *verts, const void *inds, int prim, int count, int *indexLowerBound, int *indexUpperBound) const { + // TODO: Remove if (morphcount == 1) - gstate.morphWeights[0] = 1.0f; + gstate_c.morphWeights[0] = 1.0f; char *ptr = (char *)verts; @@ -211,8 +212,8 @@ void VertexDecoder::DecodeVerts(DecodedVertex *decoded, const void *verts, const const u16 *uvdata = (const u16*)(ptr + tcoff); if (throughmode) { - uv[0] = (float)uvdata[0] / (float)(gstate.curTextureWidth); - uv[1] = (float)uvdata[1] / (float)(gstate.curTextureHeight); + uv[0] = (float)uvdata[0] / (float)(gstate_c.curTextureWidth); + uv[1] = (float)uvdata[1] / (float)(gstate_c.curTextureHeight); } else { @@ -273,7 +274,10 @@ void VertexDecoder::DecodeVerts(DecodedVertex *decoded, const void *verts, const break; default: - c[0]=255; c[1]=255; c[2]=255; c[3]=255; + c[0] = 255; + c[1] = 255; + c[2] = 255; + c[3] = 255; break; } @@ -281,7 +285,7 @@ void VertexDecoder::DecodeVerts(DecodedVertex *decoded, const void *verts, const memset(normal, 0, sizeof(float)*3); for (int n = 0; n < morphcount; n++) { - float multiplier = gstate.morphWeights[n]; + float multiplier = gstate_c.morphWeights[n]; if (gstate.reversenormals & 0xFFFFFF) { multiplier = -multiplier; } @@ -358,7 +362,7 @@ void VertexDecoder::DecodeVerts(DecodedVertex *decoded, const void *verts, const { const float *fv = (const float*)(ptr + onesize_*n + posoff); for (int j = 0; j < 3; j++) - v[j] += fv[j] * gstate.morphWeights[n]; + v[j] += fv[j] * gstate_c.morphWeights[n]; } break; @@ -368,7 +372,7 @@ void VertexDecoder::DecodeVerts(DecodedVertex *decoded, const void *verts, const if (throughmode) multiplier = 1.0f; const short *sv = (const short*)(ptr + onesize_*n + posoff); for (int j = 0; j < 3; j++) - v[j] += (sv[j] * multiplier) * gstate.morphWeights[n]; + v[j] += (sv[j] * multiplier) * gstate_c.morphWeights[n]; } break; @@ -376,7 +380,7 @@ void VertexDecoder::DecodeVerts(DecodedVertex *decoded, const void *verts, const { const s8 *sv = (const s8*)(ptr + onesize_*n + posoff); for (int j = 0; j < 3; j++) - v[j] += (sv[j] / 127.f) * gstate.morphWeights[n]; + v[j] += (sv[j] / 127.f) * gstate_c.morphWeights[n]; } break; diff --git a/GPU/GPUInterface.h b/GPU/GPUInterface.h index 5e373b5d93..049f720833 100644 --- a/GPU/GPUInterface.h +++ b/GPU/GPUInterface.h @@ -27,4 +27,7 @@ public: virtual void ExecuteOp(u32 op, u32 diff) = 0; virtual bool InterpretList() = 0; virtual void DrawSync(int mode) = 0; + + // Internal hack to avoid interrupts from "PPGe" drawing (utility UI, etc) + virtual void EnableInterrupts(bool enable) = 0; }; diff --git a/GPU/GPUState.cpp b/GPU/GPUState.cpp index 801aa07f89..9877395ab3 100644 --- a/GPU/GPUState.cpp +++ b/GPU/GPUState.cpp @@ -36,7 +36,9 @@ #include "../Core/System.h" GPUgstate gstate; +GPUStateCache gstate_c; GPUInterface *gpu; +GPUStatistics gpuStats; void InitGfxState() { @@ -53,9 +55,9 @@ void InitGfxState() 0,0,0,}; static const float identity4x4[16] = {1,0,0,0, - 0,1,0,0, - 0,0,1,0, - 0,0,0,1}; + 0,1,0,0, + 0,0,1,0, + 0,0,0,1}; memcpy(gstate.worldMatrix, identity4x3, 12 * sizeof(float)); memcpy(gstate.viewMatrix, identity4x3, 12 * sizeof(float)); @@ -85,9 +87,12 @@ void ShutdownGfxState() // or saved the context and has reloaded it, call this function. void ReapplyGfxState() { + if (!gpu) + return; // ShaderManager_DirtyShader(); // The commands are embedded in the command memory so we can just reexecute the words. Convenient. // To be safe we pass 0xFFFFFFF as the diff. + /* gpu->ExecuteOp(gstate.cmdmem[GE_CMD_ALPHABLENDENABLE], 0xFFFFFFFF); gpu->ExecuteOp(gstate.cmdmem[GE_CMD_ALPHATESTENABLE], 0xFFFFFFFF); gpu->ExecuteOp(gstate.cmdmem[GE_CMD_BLENDMODE], 0xFFFFFFFF); @@ -97,4 +102,24 @@ void ReapplyGfxState() gpu->ExecuteOp(gstate.cmdmem[GE_CMD_CULLFACEENABLE], 0xFFFFFFFF); gpu->ExecuteOp(gstate.cmdmem[GE_CMD_SCISSOR1], 0xFFFFFFFF); gpu->ExecuteOp(gstate.cmdmem[GE_CMD_SCISSOR2], 0xFFFFFFFF); + */ + for (int i = GE_CMD_VERTEXTYPE; i < GE_CMD_BONEMATRIXNUMBER; i++) + { + gpu->ExecuteOp(gstate.cmdmem[i], 0xFFFFFFFF); + } + + // Can't write to bonematrixnumber here + + for (int i = GE_CMD_MORPHWEIGHT0; i < GE_CMD_PATCHFACING; i++) + { + gpu->ExecuteOp(gstate.cmdmem[i], 0xFFFFFFFF); + } + + // There are a few here in the middle that we shouldn't execute... + + for (int i = GE_CMD_VIEWPORTX1; i < GE_CMD_TRANSFERSTART; i++) + { + gpu->ExecuteOp(gstate.cmdmem[i], 0xFFFFFFFF); + } + // TODO: there's more... } diff --git a/GPU/GPUState.h b/GPU/GPUState.h index 312f24d13d..864d523316 100644 --- a/GPU/GPUState.h +++ b/GPU/GPUState.h @@ -72,8 +72,6 @@ struct Color4 struct GPUgstate { - u16 paletteMem[256*2]; - union { u32 cmdmem[256]; @@ -230,6 +228,20 @@ struct GPUgstate }; }; + float worldMatrix[12]; + float viewMatrix[12]; + float projMatrix[16]; + float tgenMatrix[12]; + float boneMatrix[8*12]; +}; + +struct GPUStateCache +{ + // Real data in the context ends here + // The rest is cached simplified/converted data for fast access. + // What we have here still fits into 512 words, but just barely so we should + // in the future just recompute the below on an sceGeRestoreContext(). + u32 vertexAddr; u32 indexAddr; @@ -249,17 +261,22 @@ struct GPUgstate u32 curTextureWidth; u32 curTextureHeight; +}; - float worldMatrix[12]; - float viewMatrix[12]; - float projMatrix[16]; - float tgenMatrix[12]; - float boneMatrix[8*12]; +// TODO: Implement support for these. +struct GPUStatistics +{ + // Per frame statistics + int numDrawCalls; + int numTextureSwitches; + int numShaderSwitches; + + // Total statistics + int numFrames; }; void InitGfxState(); void ShutdownGfxState(); - void ReapplyGfxState(); // PSP uses a curious 24-bit float - it's basically the top 24 bits of a regular IEEE754 32-bit float. @@ -282,4 +299,6 @@ inline unsigned int toFloat24(float f) { class GPUInterface; extern GPUgstate gstate; -extern GPUInterface *gpu; \ No newline at end of file +extern GPUStateCache gstate_c; +extern GPUInterface *gpu; +extern GPUStatistics gpuStats; \ No newline at end of file diff --git a/GPU/Null/NullGpu.cpp b/GPU/Null/NullGpu.cpp index c9cff19f3c..0445eecff4 100644 --- a/GPU/Null/NullGpu.cpp +++ b/GPU/Null/NullGpu.cpp @@ -121,13 +121,13 @@ void NullGPU::ExecuteOp(u32 op, u32 diff) break; case GE_CMD_VADDR: /// <<8???? - gstate.vertexAddr = ((gstate.base & 0x00FF0000) << 8)|data; - DEBUG_LOG(G3D,"DL VADDR: %06x", gstate.vertexAddr); + gstate_c.vertexAddr = ((gstate.base & 0x00FF0000) << 8)|data; + DEBUG_LOG(G3D,"DL VADDR: %06x", gstate_c.vertexAddr); break; case GE_CMD_IADDR: - gstate.indexAddr = ((gstate.base & 0x00FF0000) << 8)|data; - DEBUG_LOG(G3D,"DL IADDR: %06x", gstate.indexAddr); + gstate_c.indexAddr = ((gstate.base & 0x00FF0000) << 8)|data; + DEBUG_LOG(G3D,"DL IADDR: %06x", gstate_c.indexAddr); break; case GE_CMD_PRIM: @@ -143,7 +143,7 @@ void NullGPU::ExecuteOp(u32 op, u32 diff) "TRIANGLE_FAN=5,", "RECTANGLES=6,", }; - DEBUG_LOG(G3D, "DL DrawPrim type: %s count: %i vaddr= %08x, iaddr= %08x", type<7 ? types[type] : "INVALID", count, gstate.vertexAddr, gstate.indexAddr); + DEBUG_LOG(G3D, "DL DrawPrim type: %s count: %i vaddr= %08x, iaddr= %08x", type<7 ? types[type] : "INVALID", count, gstate_c.vertexAddr, gstate_c.indexAddr); } break; @@ -200,7 +200,8 @@ void NullGPU::ExecuteOp(u32 op, u32 diff) int behaviour = (data >> 16) & 0xFF; int signal = data & 0xFFFF; - __TriggerInterruptWithArg(PSP_GE_INTR, PSP_GE_SUBINTR_SIGNAL, signal); + if (interruptsEnabled_) + __TriggerInterruptWithArg(PSP_GE_INTR, PSP_GE_SUBINTR_SIGNAL, signal); } break; @@ -230,7 +231,8 @@ void NullGPU::ExecuteOp(u32 op, u32 diff) case GE_CMD_FINISH: DEBUG_LOG(G3D,"DL CMD FINISH"); - __TriggerInterruptWithArg(PSP_GE_INTR, PSP_GE_SUBINTR_FINISH, 0); + if (interruptsEnabled_) + __TriggerInterruptWithArg(PSP_GE_INTR, PSP_GE_SUBINTR_FINISH, 0); break; case GE_CMD_END: @@ -248,6 +250,7 @@ void NullGPU::ExecuteOp(u32 op, u32 diff) } // This should generate a Reading Ended interrupt + // if (interruptsEnabled_) // __TriggerInterrupt(PSP_GE_INTR); break; @@ -305,23 +308,23 @@ void NullGPU::ExecuteOp(u32 op, u32 diff) break; case GE_CMD_TEXSCALEU: - gstate.uScale = getFloat24(data); - DEBUG_LOG(G3D, "DL Texture U Scale: %f", gstate.uScale); + gstate_c.uScale = getFloat24(data); + DEBUG_LOG(G3D, "DL Texture U Scale: %f", gstate_c.uScale); break; case GE_CMD_TEXSCALEV: - gstate.vScale = getFloat24(data); - DEBUG_LOG(G3D, "DL Texture V Scale: %f", gstate.vScale); + gstate_c.vScale = getFloat24(data); + DEBUG_LOG(G3D, "DL Texture V Scale: %f", gstate_c.vScale); break; case GE_CMD_TEXOFFSETU: - gstate.uOff = getFloat24(data); - DEBUG_LOG(G3D, "DL Texture U Offset: %f", gstate.uOff); + gstate_c.uOff = getFloat24(data); + DEBUG_LOG(G3D, "DL Texture U Offset: %f", gstate_c.uOff); break; case GE_CMD_TEXOFFSETV: - gstate.vOff = getFloat24(data); - DEBUG_LOG(G3D, "DL Texture V Offset: %f", gstate.vOff); + gstate_c.vOff = getFloat24(data); + DEBUG_LOG(G3D, "DL Texture V Offset: %f", gstate_c.vOff); break; case GE_CMD_SCISSOR1: @@ -365,7 +368,7 @@ void NullGPU::ExecuteOp(u32 op, u32 diff) break; case GE_CMD_TEXADDR0: - gstate.textureChanged=true; + gstate_c.textureChanged=true; case GE_CMD_TEXADDR1: case GE_CMD_TEXADDR2: case GE_CMD_TEXADDR3: @@ -377,7 +380,7 @@ void NullGPU::ExecuteOp(u32 op, u32 diff) break; case GE_CMD_TEXBUFWIDTH0: - gstate.textureChanged=true; + gstate_c.textureChanged=true; case GE_CMD_TEXBUFWIDTH1: case GE_CMD_TEXBUFWIDTH2: case GE_CMD_TEXBUFWIDTH3: @@ -397,16 +400,12 @@ void NullGPU::ExecuteOp(u32 op, u32 diff) break; case GE_CMD_LOADCLUT: + // This could be used to "dirty" textures with clut. { - u32 clutAttr = ((gstate.clutaddrupper & 0xFF0000)<<8) | (gstate.clutaddr & 0xFFFFFF); - if (clutAttr) + u32 clutAddr = ((gstate.clutaddrupper & 0xFF0000)<<8) | (gstate.clutaddr & 0xFFFFFF); + if (clutAddr) { - u16 *clut = (u16*)Memory::GetPointer(clutAttr); - if (clut) { - int numColors = 16 * (data&0x3F); - memcpy(&gstate.paletteMem[0], clut, numColors * 2); - } - DEBUG_LOG(G3D,"DL Clut load: %i palettes", data); + DEBUG_LOG(G3D,"DL Clut load: %08x", clutAddr); } else { @@ -416,7 +415,7 @@ void NullGPU::ExecuteOp(u32 op, u32 diff) } break; -// case GE_CMD_TRANSFERSRC: +//case GE_CMD_TRANSFERSRC: case GE_CMD_TRANSFERSRCW: { @@ -469,9 +468,9 @@ void NullGPU::ExecuteOp(u32 op, u32 diff) } case GE_CMD_TEXSIZE0: - gstate.textureChanged=true; - gstate.curTextureWidth = 1 << (gstate.texsize[0] & 0xf); - gstate.curTextureHeight = 1 << ((gstate.texsize[0]>>8) & 0xf); + gstate_c.textureChanged=true; + gstate_c.curTextureWidth = 1 << (gstate.texsize[0] & 0xf); + gstate_c.curTextureHeight = 1 << ((gstate.texsize[0]>>8) & 0xf); //fall thru - ignoring the mipmap sizes for now case GE_CMD_TEXSIZE1: case GE_CMD_TEXSIZE2: @@ -546,7 +545,7 @@ void NullGPU::ExecuteOp(u32 op, u32 diff) int c = n % 3; float val = getFloat24(data); DEBUG_LOG(G3D,"DL Light %i %c pos: %f", l, c+'X', val); - gstate.lightpos[l][c] = val; + gstate_c.lightpos[l][c] = val; } break; @@ -560,7 +559,7 @@ void NullGPU::ExecuteOp(u32 op, u32 diff) int c = n % 3; float val = getFloat24(data); DEBUG_LOG(G3D,"DL Light %i %c dir: %f", l, c+'X', val); - gstate.lightdir[l][c] = val; + gstate_c.lightdir[l][c] = val; } break; @@ -574,7 +573,7 @@ void NullGPU::ExecuteOp(u32 op, u32 diff) int c = n % 3; float val = getFloat24(data); DEBUG_LOG(G3D,"DL Light %i %c att: %f", l, c+'X', val); - gstate.lightatt[l][c] = val; + gstate_c.lightatt[l][c] = val; } break; @@ -589,9 +588,9 @@ void NullGPU::ExecuteOp(u32 op, u32 diff) int l = (cmd - GE_CMD_LAC0) / 3; int t = (cmd - GE_CMD_LAC0) % 3; - gstate.lightColor[t][l].r = r; - gstate.lightColor[t][l].g = g; - gstate.lightColor[t][l].b = b; + gstate_c.lightColor[t][l].r = r; + gstate_c.lightColor[t][l].g = g; + gstate_c.lightColor[t][l].b = b; } break; @@ -618,9 +617,9 @@ void NullGPU::ExecuteOp(u32 op, u32 diff) break; case GE_CMD_PATCHDIVISION: - gstate.patch_div_s = data & 0xFF; - gstate.patch_div_t = (data >> 8) & 0xFF; - DEBUG_LOG(G3D, "DL Patch subdivision: %i x %i", gstate.patch_div_s, gstate.patch_div_t); + gstate_c.patch_div_s = data & 0xFF; + gstate_c.patch_div_t = (data >> 8) & 0xFF; + DEBUG_LOG(G3D, "DL Patch subdivision: %i x %i", gstate_c.patch_div_s, gstate_c.patch_div_t); break; case GE_CMD_MATERIALUPDATE: @@ -731,7 +730,7 @@ void NullGPU::ExecuteOp(u32 op, u32 diff) int index = cmd - GE_CMD_MORPHWEIGHT0; float weight = getFloat24(data); DEBUG_LOG(G3D,"DL MorphWeight %i = %f", index, weight); - gstate.morphWeights[index] = weight; + gstate_c.morphWeights[index] = weight; } break; diff --git a/GPU/Null/NullGpu.h b/GPU/Null/NullGpu.h index 26e49c53cb..6f55182097 100644 --- a/GPU/Null/NullGpu.h +++ b/GPU/Null/NullGpu.h @@ -24,11 +24,16 @@ class ShaderManager; class NullGPU : public GPUInterface { public: + NullGPU() : interruptsEnabled_(true) {} virtual u32 EnqueueList(u32 listpc, u32 stall); virtual void UpdateStall(int listid, u32 newstall); virtual void ExecuteOp(u32 op, u32 diff); virtual bool InterpretList(); virtual void DrawSync(int mode); + virtual void EnableInterrupts(bool enable) { + interruptsEnabled_ = enable; + } private: bool ProcessDLQueue(); + bool interruptsEnabled_; }; diff --git a/SDL/buildassets.sh b/SDL/buildassets.sh index 48fd66387c..82f8ca3df6 100755 --- a/SDL/buildassets.sh +++ b/SDL/buildassets.sh @@ -1 +1,2 @@ cp -r ../android/assets . +cp ../ppge_atlas.zim assets diff --git a/Windows/PPSSPP.vcxproj b/Windows/PPSSPP.vcxproj index b5a069f277..1b399343c9 100644 --- a/Windows/PPSSPP.vcxproj +++ b/Windows/PPSSPP.vcxproj @@ -89,6 +89,10 @@ + + ..\ + PPSSPPDebug + Disabled @@ -105,7 +109,6 @@ XInput.lib;Winmm.lib;Ws2_32.lib;opengl32.lib;glu32.lib;comctl32.lib;dsound.lib;xinput.lib;%(AdditionalDependencies) true - $(OutDir)$(ProjectName).pdb Windows MachineX86 $(OutDir)$(TargetName)$(TargetExt) diff --git a/android/assets/ppge_atlas.zim b/android/assets/ppge_atlas.zim new file mode 100644 index 0000000000000000000000000000000000000000..99114d6ac2bbf069eaa4d68b84d71fb11ba90689 GIT binary patch literal 131088 zcmeI5&5m5xk>|7f3EK7xxUKTu!Z>R$54wn1%%a&CAWJ&9|G)=GEq#&GXHp2_-WOLHDC+ z-)Lhj&o@ufwYWP!d$M`Hy?dC79>;36xiYL)4>!*@FSh?)42}=3MA6sVUT9L#Q{7&n z^*blOT;Ev#=JfpZ{Oq3=TR=a;{mt{KRGx3{55{jPYCnIwdDUHO+lUU2dl?IOvZYiO z5PaOqb;zUdnXk0%o=tTRJS+XP1 ze}D68OGj}3;)1TY_GC*bajZf}D4(rX@0`4Ma%260w0^38x3ArK|K7*<{`ITRzxee0 z?BnG?=etI+0Vkp%3QLjNx}-)#R5AAyzh|EIg3{I4_p{mVb(_Sv=H-?;nH7oUFd=~thB@wv4B)#vADzd0TEMA~tTb`OfYo^Bqb zR+8=0Z7pE>Pw(82uj{Wp{{H6q>AMRnK(q&6-yVp)k1vD>Phbcc#hI}xBMaye_u~vK zy=J2gXQMXipKVz1a`SxiI7O<57xr8AAD+kv^JC}#JI&{#{Ga;I@*?B-lVVbMkYfT7 zb(#KGt6OKEUF$s`dpJM6v9JQL+^PDYV$Q#$47d_RbA2E5^z`CvUfBf}dI?7D$M@Ag z`+vZoipKf!0 z%KPO1FFyV3?1LYNL|Y#6XSE8AItS(Zqw|OXs_ACq;Em>tNHD^uYZ=Q}!|pk|XFeQf zM(}E90k)Ah=>G@uKQ?JyI~zRQap8PuX;K|6)&DQo=co5Ro<)E=*U!&>__s4z=j)Oi zHQMqxXfM*dt7DI^x@#ss5SwVb@<@ zWKPRIW7B!n|JVZN+IRn;Y6NrrFSq;P;-daPkpJmnU8{OfJhc9uKka>Fx@Gzozqd}& ze;)!kt&@7q6k_vBaW57z&9VhyZTcqZ~`H8cKSCS~s|uAH=#_XlgcQzK%AT=jMA~UsMQnt;ZG9{<}0e;sY~$*XJM3^ZpS zQ>Lr^&`*0^tw#E<766R2f7t)Y@s1)@|J?xb^ZxnihwC5ytz(3q3+z^hFY1Kz(+_s@!_~@qyo?W6GM2=vf#&dY zVp>R&nL~{Wxzf17p-RwkG$^RvKa+|i z_LJ{v-T&T4ZT7$Sv97v^ zn-)uq%{YQNmFhpQ|6lFmD=prH|1Zt|F{WdWy~0)B!<}^mU(5BsTHW}ua{29R$^x+t zpyz*D{dxN>JtO%2jd(5)^}(GR=WEXo&_DB!ko%!C>*d={bLfkVR`F0b1joKV(|@k| z1WWy2D?SglD=jZKFE1hyk*VrGysy$a`qcUV!TcZVyRMln7i_^1G2-D8{YRVkPHvr^ zpZ@k@CivCon)%&2d;9yV)y*HDpWU9U5#IgC^?~9hd3?m}zH6358~>S2wE7K9tTt5p z80){){@enp|BtQtVH16@{c)rUit`!qYkB@>2KZ>_8J=ZZ?@x9X8JRM4YlyMA^UhoE zZlC;quzu&Q)#~jZ-CX;*|Gkg(6i`otwf3(kMCWT~{I))DJ68a!6?r^HT6X4DgO`ow zY)zXzYYAj&uM0BPNdH;;M3tEZs6UvQVLaYE-9`bA@gU)NgZ_Uo|1$&hsy|$_0$^{5 zCu3+Ch>Gx^PJX$*xxTe~-v8U}@fRn5|F^5vyFdMKt_mJ2ezn$|Uw!U&GlSe$YXJYe)@Wbv1eCRbRA)ytUDtn! z(GksN{js@_M)m)hrf1h}KUCV%r~PXNRsZ+`ad$`i|uD!51WuQTe!JCKhwUx z+26g7Z(ln<{p{?6wRZikRzFwecY6EGYeTbMUwwXls$F818xVD9ud%oi`pM6K@eDK? z?MG+K1M$7ke_$Wa_Qv#_SNmsh?i}4 z6@xL%SN7=F9vRa%hyKUft$jyr)ITUY1Xcg9<^K!j|CRdvpIYx%UXLfeGjCQF`1Sgo zw|?@yo7?(tw?kBOfSY82-1m!5@BQoTYn~~Z9_*SY)iWv|?{Ze`=CbCT$<$kGT1);> z1Gw%mmXT&hl=SV?U;h7UJI@Mk#!&U|I!v|L;eWto=KmuOX4hK%DZ|K(xH^Zz#ilFSDe6=3$^I9LAv z;B>Y6uP3*5>jEFH-~FjZfA_@e1$sB&&iiVob%I-GH`l*f|NKNxh|qt|p30xkN>Cds`~Q2oXIDZK(L&c&ssK)Z z|IsY}-@U2&Uo$}M2>9%pqrt89&GkD!Sgn5YH#c}!;Pk`wjrDsc|M(Vmsd4hC`TYrj z-}}=V1<~D*=c~f7U)D=NtB9-%kE_0rNt}fRco%~F|KTon?au&jNdF7=|0^o_jkKV9 zd}d9=+iPlN{lEKD6+gai1t?hNK2mI>C?{0H~A&;N+uj^E0 zbBJdZ#)CDzE-(*`8B(Tmd~OS17V7%{)#gRAj4`19*MVjG|DJBwdE`GYnk-v7-t%syb3d(V4MaeoCK^#0%7PxjCMwY$Sl`IS9e%a-+$udM3_ zyA?sIYg4#deYn1TrrBHjr+t36PNm_Sde+}O?b8~c?!Wz`o(rzbWbkiB_G-BF&$yP1=0Ca8MiZV% zyO*zdJ^$Xvb^dO z;p=`L43Cz;vj3O$p_ShF+y57K>^`P2vRb@B9M_(0xv>6_)Xx9+&i_3l6`%6;tba*{ zT`86W99aK3{yVq-ez(_aH-pKjS?<~05Ett8k0t%BOaXYS*9 z2XV`DS>--#R(L#{@QxMqza;<9{J*sZjR6O`SM$H_c^?14`o{X*6Ycvz^17#0pV>~} zuk@sUx7TkZ5k}S12x`xItQD#?&HNuK{5(*RG*>jv$63A_jn#s@)@F`be=`s*P2t1c zGvikm{WMnS2#H({BoW&vPd~jX`E={?TpPckdG-7+UcM=DGV9;;Nw3xiqJ2K|b?GU`?Pwv}#}Cw2pY@kxA^BhNSXMwx z_TF~$%aCtz~2i9f2#2jx1DVqS+ZNsE=#dtFF}AfwvVrnsM@mrpK%F zq5oz1Ur!_?58*JSI*ZCOXf>b2qgMaXu0PZKkavNk_4<6^i%)qMsPBpY%OhhyX4C=d zA<3id7K3FG{%=WvNuH(WF@nqZf9#mlc(xhu7^+@l%wbvTCr(-`QN0kh)d2-R*_X*W>MLA5Lcg z8r3=79`bmrZ%1g`t0)iY1-;gd0H4-3D+#D;#fkP_3qnie|9SjJ|JGyR#}1*P*S|GI z<)C(6)8=WFxfNs^$#Fz>CfR%ckTJRXr$^HNg7tqzlBe50_m_oc+k+Q85&y6GKU$5> zR;%~c=j(eP#k}7!fX{cXpP&Bl`=g$CmpnxJc(BXh&$g0Wu76vQBERHEbdy}4?ezb8 z{%`z;^>6#5mKVp)?pQ=vd)7hNkt;p7_WnHKPz0nJk;Dv3@_#FH*{9>kvuz!#iWg~# zHvNtBe~YPpekZ*RUVUGm^h8MS1JyqM6cSOE(%6=sWD?fD)c@_d$X{}M()s_A{O^c- zdH<(!AOo@YHhh;@#T7}xR%5RhSVLq2SG@K|wMPF-@_&`Mq-#HrRcc=KXb@emqW|p* z@wJ-w9Ru!t?C1U38&s+BCtVeXw(nS_4E-;O|Mty#61a|AkkF zulsrb`Pql-*&1L-MDai3Q&_?h{WJfEdP!GuQ%0~%|2+Ah=t;b{T@sI+?OcCk|0ilZ z+Hy^`V?8|H(GSM(|0VPPtS#9Sqe?cmDCytUiho*Om&yO4>AjQlQ|%J`{Y}07>vsWe ztv_5}KY91$C)<7gnU*-O{vZ0ks{dQ!;z$_8qxt#n{68#9T)6_V_b_%ugRu7O|M3lc z(gw3#)BR)@QP5n`|DxyrmbI{j4e6655>`?5e_8+k`R+Xdtq|A!J>U(U=d+NA^8ZNx zl1b$M2b*V`=bL92GeQA5)if*Xi&Jr?OlmoXmcHBk&n^O20FL3IYtyQFJoG7PDB6iy z#X4+<%2E91%JVAuzg_V=?Ejb3zpV1ssaA*IJK=f%e!XJ@mdNt_Z|zYHSr*J7O|#@B zZOaZMWyjI)&i`9Uc|7~PXh5IhcqS9usNc{rr9=|Hp~L*qI1HD`|5{zo78m|6Y55Mc znf{h5^ff< zJCpwR<^S&Qw#k)+#MrMyRCp+W?5hrWLo*3z;P`{cUznMO7G~I7wOA#b;zK8ArdR*p6-@_oRkGCseJ$~)4b9`ZTf)3H2`f$yd zVr5k}Qe%=wkoS7+-kB?}e~)+n70bZ6 z8Cki9t9xtMt-z%E!8JtfaadDqG41eW^GY zy*=)0g$$xk_W69S7Q)m&S8w${h8W?{Sx+zWIMkE-JqF#OQjJy>xb9f;V3+rwl-S;4 zw*Ip(2#Z_gJV~q*^l{SuDBWtd|_l@sF` zOWv(xny7-StX-ivLPO2{&9jR)AjIRV?aUDTYUR0?>Z9P_lrolLv;P$T`*Zl}=he&f ze;I)CeMflj+i0ZrDl}F?fDsOwMI7uWt39B{4e>?q@ByPShSpHMgP? zWUZmcZm$u9{lh!Ji2IHevpqa(&V4T@C(SQ;Vo!g;*#CPQa-7OLy=@Q7NrPs8HzB)f zHCE=``^UtS&-|Rq=UM-TCHiNL$Hy#J)6`$jZG0|zY;n|wz7AJfi;!Kb4YNP)fsH!q z&FbG+W0uNjj{k@2B-%?`bp~mzjPgIe2B*T|^$BWrUBMzeLY9UyI@N>jX8pUhYjZkVA=Q~!4*xWvG;$|@^p6$Ke1d~U*s{xqgQRrbA{S+{AszI)c?)+fA#@;&B*`ly(9hW zIi~iIOXoW3lh1XQpON%h>uVDGWvz^Cr@4|armDRvQO7oR%+<qL zmMW!c$#*=KF{aZS+I>&+P|Ikov(0!ovDzG$8qQ6>2dc>tTtZiF_ zqLI-$U8b#`w>C1St(B8;T*d!Gib1b_ht^Mf1@YuN z>woV5rbU?pOUmcIYfRL325G0|3(Z#j+y8=ce6P0hNd7-tw&!@!HndmQ$EyCx{lYi) zf5S-s_`mwP9>_I%z1HjBGN`n*ax#~)%jN!WD|WO;v;5{mfOdTtyCWs%^Zf4?k~r&` z(m&_E%Xs>hKJTv3{)t}y_+@BI{V(tTp557ETs^eW+fel)U6@|iLFmBaR}5I{NdIA} z`gKjkiIA!Adk=*1_4?-*IWy+5{>532Y_?$WfE@2{l@Oz-t^I& zL=h#ZMH*`RCj8&B&HuN2A=Rq?%lm)Un9oB4;%ek$+5g>#JUI6MQ4N~=S$e)=i!kSP z?2-Q6M^9`0*ZYa`n!o858jai7GJl>20nm|Y3(1fz@!hQddH(mv+2`{)boto+-|8Q` zt@_V04DHn!X2ooucYWYkKyGqWW1O-7d&U{7ogP2@G1CxNML|m`nv2oR+vc52yyCbk5y;?)w=NJ#@5ZMZSD9 z{vXw!#;9`|>%aOS6p1IDXDtSmHU1;vk^X}p@0L`SW(;{OQly*)>9;?k8@v{=|ATiwLz+{=l|9? z)U@mAd7P2|)1I1GS`g?nyd&YfDkx5~<(OyrLabgz8)n_e5wN`4|JyjJ`}S41bPr<* zIadAxt7wDIDr?(>t;!tGOY0!Yd0rjt>CMmC^11p~OkO2oZH_9-G&!qQnl79F9q}VG z)-|OVhmqk>JcVXQ5c+2hlA|a3&;C!84L@~m;xlptprsy1`uBW#T>p*ZTi_I*HP-tc z->^K=|D#<7aOB!gZ;a$KjTe8mF~h5ixN4dVRsXG5ktM3^13ytk@Am7TB_19(^AGVP zEZSL~|9O1>uI@it}+?{~Jd7ul}EH zLbfFcuSJeP9yiX%`WNQq^Z&p`Ja(Ln=l}eELewVFXIB3&g}^jBlkDF_{^uDMYmqu; znR^_+!BO+0co|V=4c7W^x&M0xMxM?q6B?_P-)Q{4{&Ooume=ur_5{}bKe5v-OT+x) zLqYeL-h9;@<}2fKjmB=P8rd!X@G5d|jS^t3)t|0XgGKbFZ9UHP?{C+w`iF-7l*Z_I zykiNuDC7uKiuiO{|JV0}DZWn)F0EodK%>8n@85t%A9sWxq-az9gK>yv%wJ$o%Jb)?a!kf%l)=l@Z^d@XR~tL=Gi zWq!x{r*0sRXfJ6*o{GiqZpJPNj~V*s8Bx4PW5_iLxtG21Iz|;M2}ceyen~3c@!AKi z3`U>D5i~?rP)qB-K4amkD0FQ?E>Mq_meF|iTF7(e|4X3a9DjSQWEW@9cW9&$(0Anj z+?yXq7-tYz_T_(DeXO@cFP&Ncu6zCNr~OvIcTIZy=ofXwI49NnY7_A$u#C^J$MIcX z?b}odsg=3Tk0+G$W<_OSNT-g&;~4{BizQlef9q+ z<3>-9=QdIIB0oozR{znvJzGM3+oyguhAJWA1Cq*Z+#87mr97okrt*7su1blKnNn4N zdIn&P6%jak=}hCX z)|jg$Q}0|DQmuXaPnr7B-6f!YelBk*DGvD`^l233YF)Q~RlFWqnF>j(t==#X3(u4~ zQ$O5FD%Splg;r$8pe5v4$EJs*D#`2nPc%OWY#JwOBj>69seXR{L41zh4>q6r-?Qq> zok90()nQ@LOJ|m)MyOA0d;KqiihcAcBs99~YnBS{6mzWlH_dbX8&me#JYJ^4vl>5F zW+ljN-705CXgREZ&EM^N%meb6L5s0db-InE?|iHgJx7h5zoA{@F^--l-SxeF`JdTR zj(oN#KN%g<9USNk>(F^bNu;0KW^6gasV(iS|KNw~J_>_kmi`XuzxIqznF=Dcfcy|6 zQ8$Kn1s0vbIgsz_`%AS$-M=)G$Bb59{~+$TjqN6M#;;Y_i(@3OBB|Dfm+%ckJ(bzzh#p3-)lAW6;hC9h`MncWjMuD*|l1U{yZx@tpAXo&fwQj?~OlY zU9cu8sBzM*?0s1}8D||kQmp(K?EiwW zN1pJ+h{V+DZ6T@4`hWD~?64`&QpbpG`KmqEbL(0iguOJl^I`WnwfH&?QShdfxlS>pepIoBFsfu1?g za^F$3_WaZy`}9CdsNi!xS{8@m@zwQj??;v%t?GZoVITipZ)c5}CZ7BmM*dF)f~Ba9 zAU}u55?QMMycX#?BJ*_!>WJe{w$+~V+}irD*5~_i4O((P&MoO&|Bv)B(*I%57`1v? z>i@m|4dMSh_qNQTW$Z7uL8@2UVDm^Kj;5LS6?J6pr#6;2@h6@|@TR!iycvL2#ednG z_Z?<>M2$7Z+M@aJlQA-=!FTjdrhd~&yF?xPW8PtlGxWZOtc_>i|BQz%p*QWpJ3YI++EU7?FI*h@#Tg8~S&fL;hbOe?OXV_Rk`-JZvNRN`JnjO~f

CeFI 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 literal 0 HcmV?d00001 diff --git a/android/buildassets.sh b/android/buildassets.sh index 7828c2a2e2..faeb1a26ef 100644 --- a/android/buildassets.sh +++ b/android/buildassets.sh @@ -1,5 +1,6 @@ mkdir -p assets ./buildatlas.sh +cp ../ppge_atlas.zim assets #cp -r source_assets/songs assets #cp -r source_assets/samples assets #cp -r ../shaders assets diff --git a/android/jni/Android.mk b/android/jni/Android.mk index 025c73a38b..53a379946b 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -63,6 +63,7 @@ LOCAL_SRC_FILES := \ $(SRC)/Common/IniFile.cpp \ $(SRC)/Common/FileUtil.cpp \ $(SRC)/Common/StringUtil.cpp \ + $(SRC)/Common/Thread.cpp \ $(SRC)/Common/Timer.cpp \ $(SRC)/Common/ThunkARM.cpp \ $(SRC)/Common/Misc.cpp \ @@ -150,7 +151,9 @@ LOCAL_SRC_FILES := \ $(SRC)/Core/MIPS/ARM/Jit.cpp \ $(SRC)/Core/MIPS/ARM/CompLoadStore.cpp \ $(SRC)/Core/MIPS/ARM/RegCache.cpp \ - $(SRC)/Core/Util/BlockAllocator.cpp + $(SRC)/Core/Util/BlockAllocator.cpp \ + $(SRC)/Core/Util/ppge_atlas.cpp \ + $(SRC)/Core/Util/PPGeDraw.cpp include $(BUILD_SHARED_LIBRARY) diff --git a/build_ppgeatlas.sh b/build_ppgeatlas.sh new file mode 100644 index 0000000000..b85695f0cb --- /dev/null +++ b/build_ppgeatlas.sh @@ -0,0 +1 @@ +native/tools/build/atlastool ppge_atlasscript.txt ppge && mv ppge_atlas.cpp ppge_atlas.h Core/Util diff --git a/main.cpp b/main.cpp index b42684bd2e..e9c65336af 100644 --- a/main.cpp +++ b/main.cpp @@ -56,7 +56,7 @@ int WINAPI WinMain(HINSTANCE _hInstance, HINSTANCE hPrevInstance, LPSTR szCmdLin token = strtok(szCmdLine," "); g_Config.Load(); - VFSRegister("", new DirectoryAssetReader("shaders")); + VFSRegister("", new DirectoryAssetReader("")); while (token) { diff --git a/ppge_atlas.zim b/ppge_atlas.zim new file mode 100644 index 0000000000000000000000000000000000000000..99114d6ac2bbf069eaa4d68b84d71fb11ba90689 GIT binary patch literal 131088 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

CeFI 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 literal 0 HcmV?d00001 diff --git a/ppge_atlasscript.txt b/ppge_atlasscript.txt new file mode 100644 index 0000000000..104b14428e --- /dev/null +++ b/ppge_atlasscript.txt @@ -0,0 +1,8 @@ +256 +font UBUNTU24 android/source_assets/font/zrnic.ttf 30 +image I_CROSS android/source_assets/image/cross.png copy +image I_CIRCLE android/source_assets/image/circle.png copy +image I_SQUARE android/source_assets/image/square.png copy +image I_TRIANGLE android/source_assets/image/triangle.png copy +image I_BUTTON android/source_assets/image/button.png copy +image I_LOGO android/res/drawable-mdpi/ic_launcher.png copy From 5596b98529384cb37ce97103ba749e8be0298fa5 Mon Sep 17 00:00:00 2001 From: Henrik Rydgard Date: Sun, 18 Nov 2012 13:14:22 +0100 Subject: [PATCH 03/12] Get rid of opengl include from sceDisplay.cpp --- Core/HLE/sceDisplay.cpp | 18 ++---------------- GPU/GLES/DisplayListInterpreter.cpp | 7 +++++++ GPU/GLES/DisplayListInterpreter.h | 1 + GPU/GPUInterface.h | 1 + GPU/Null/NullGpu.h | 1 + 5 files changed, 12 insertions(+), 16 deletions(-) diff --git a/Core/HLE/sceDisplay.cpp b/Core/HLE/sceDisplay.cpp index 35ccc4d707..cd13abb232 100644 --- a/Core/HLE/sceDisplay.cpp +++ b/Core/HLE/sceDisplay.cpp @@ -15,18 +15,6 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#if defined(ANDROID) || defined(BLACKBERRY) -#include -#include -#else -#include -#if defined(__APPLE__) -#include -#else -#include -#endif -#endif - #include //#include "base/timeutil.h" @@ -46,7 +34,7 @@ #include "../../GPU/GLES/Framebuffer.h" #include "../../GPU/GLES/ShaderManager.h" #include "../../GPU/GPUState.h" - +#include "../../GPU/GPUInterface.h" // Internal drawing library #include "../Util/PPGeDraw.h" @@ -190,9 +178,7 @@ u32 sceDisplaySetMode(u32 unknown, u32 xres, u32 yres) DEBUG_LOG(HLE,"sceDisplaySetMode(%d,%d,%d)",unknown,xres,yres); host->BeginFrame(); - glClearColor(0,0,0,1); -// glClearColor(1,0,1,1); - glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT); + gpu->InitClear(); return 0; } diff --git a/GPU/GLES/DisplayListInterpreter.cpp b/GPU/GLES/DisplayListInterpreter.cpp index 4e02d04609..49e8b41bae 100644 --- a/GPU/GLES/DisplayListInterpreter.cpp +++ b/GPU/GLES/DisplayListInterpreter.cpp @@ -76,6 +76,13 @@ bool finished; u8 bezierBuf[16000]; +void GLES_GPU::InitClear() +{ + glClearColor(0,0,0,1); + // glClearColor(1,0,1,1); + glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT); +} + bool GLES_GPU::ProcessDLQueue() { std::vector::iterator iter = dlQueue.begin(); diff --git a/GPU/GLES/DisplayListInterpreter.h b/GPU/GLES/DisplayListInterpreter.h index 6a67b42f19..bf21e28811 100644 --- a/GPU/GLES/DisplayListInterpreter.h +++ b/GPU/GLES/DisplayListInterpreter.h @@ -25,6 +25,7 @@ class GLES_GPU : public GPUInterface { public: GLES_GPU() : interruptsEnabled_(true) {} + virtual void InitClear(); virtual u32 EnqueueList(u32 listpc, u32 stall); virtual void UpdateStall(int listid, u32 newstall); virtual void ExecuteOp(u32 op, u32 diff); diff --git a/GPU/GPUInterface.h b/GPU/GPUInterface.h index 049f720833..24476cc082 100644 --- a/GPU/GPUInterface.h +++ b/GPU/GPUInterface.h @@ -22,6 +22,7 @@ class GPUInterface { public: + virtual void InitClear() = 0; virtual u32 EnqueueList(u32 listpc, u32 stall) = 0; virtual void UpdateStall(int listid, u32 newstall) = 0; virtual void ExecuteOp(u32 op, u32 diff) = 0; diff --git a/GPU/Null/NullGpu.h b/GPU/Null/NullGpu.h index 6f55182097..bf1953a798 100644 --- a/GPU/Null/NullGpu.h +++ b/GPU/Null/NullGpu.h @@ -25,6 +25,7 @@ class NullGPU : public GPUInterface { public: NullGPU() : interruptsEnabled_(true) {} + virtual void InitClear() {} virtual u32 EnqueueList(u32 listpc, u32 stall); virtual void UpdateStall(int listid, u32 newstall); virtual void ExecuteOp(u32 op, u32 diff); From 75412b064be099643ae09b93a1e740ef455e0cc4 Mon Sep 17 00:00:00 2001 From: Henrik Rydgard Date: Sun, 18 Nov 2012 17:51:14 +0100 Subject: [PATCH 04/12] Implement sceUtilityMsgDialog --- Core/HLE/sceCtrl.cpp | 7 ++- Core/HLE/sceCtrl.h | 3 ++ Core/HLE/sceDisplay.cpp | 7 +++ Core/HLE/sceUtility.cpp | 83 ++++++++++++++++++++++++++--- Core/Util/PPGeDraw.h | 6 +-- GPU/GLES/DisplayListInterpreter.cpp | 4 +- 6 files changed, 97 insertions(+), 13 deletions(-) diff --git a/Core/HLE/sceCtrl.cpp b/Core/HLE/sceCtrl.cpp index 787f533a88..02511f7ad6 100644 --- a/Core/HLE/sceCtrl.cpp +++ b/Core/HLE/sceCtrl.cpp @@ -46,7 +46,6 @@ struct CtrlLatch { }; - ////////////////////////////////////////////////////////////////////////// // STATE BEGIN static bool ctrlInited = false; @@ -79,6 +78,12 @@ void UpdateLatch() { oldButtons = ctrl.buttons; } + +u32 __CtrlPeekButtons() +{ + return ctrl.buttons; +} + // Functions so that the rest of the emulator can control what the sceCtrl interface should return // to the game: diff --git a/Core/HLE/sceCtrl.h b/Core/HLE/sceCtrl.h index 10bb163c14..3e02e8feb3 100644 --- a/Core/HLE/sceCtrl.h +++ b/Core/HLE/sceCtrl.h @@ -36,3 +36,6 @@ void __CtrlButtonDown(u32 buttonBit); void __CtrlButtonUp(u32 buttonBit); // -1 to 1, try to keep it in the circle void __CtrlSetAnalog(float x, float y); + +// For use by internal UI like MsgDialog +u32 __CtrlPeekButtons(); \ No newline at end of file diff --git a/Core/HLE/sceDisplay.cpp b/Core/HLE/sceDisplay.cpp index cd13abb232..e494e3e74e 100644 --- a/Core/HLE/sceDisplay.cpp +++ b/Core/HLE/sceDisplay.cpp @@ -131,6 +131,13 @@ void hleEnterVblank(u64 userdata, int cyclesLate) // Draw screen overlays before blitting. Saves and restores the Ge context. + /* + if (g_Config.bShowGPUStats) + { + char stats[512]; + sprintf(stats, "Draw calls") + }*/ + /* PPGeBegin(); PPGeDrawImage(I_LOGO, 5, 5, 0, 0xFFFFFFFF); diff --git a/Core/HLE/sceUtility.cpp b/Core/HLE/sceUtility.cpp index d3b50a28a0..63dafa1d88 100644 --- a/Core/HLE/sceUtility.cpp +++ b/Core/HLE/sceUtility.cpp @@ -290,13 +290,15 @@ struct pspMessageDialog u32 buttonPressed; // 0=?, 1=Yes, 2=No, 3=Back }; -static pspMessageDialog messageDialog; +u32 messageDialogAddr; void sceUtilityMsgDialogInitStart() { u32 structAddr = PARAM(0); DEBUG_LOG(HLE,"FAKE sceUtilityMsgDialogInitStart(%i)", structAddr); - Memory::ReadStruct(structAddr, &messageDialog); + messageDialogAddr = structAddr; + pspMessageDialog messageDialog; + Memory::ReadStruct(messageDialogAddr, &messageDialog); if (messageDialog.type == 0) // number { INFO_LOG(HLE, "MsgDialog: %08x", messageDialog.errorNum); @@ -317,11 +319,78 @@ void sceUtilityMsgDialogShutdownStart() void sceUtilityMsgDialogUpdate() { - DEBUG_LOG(HLE,"FAKE sceUtilityMsgDialogUpdate(%i)", PARAM(0)); - __UtilityUpdate(); - // PPGeBegin(); - - // PPGeEnd(); + DEBUG_LOG(HLE,"sceUtilityMsgDialogUpdate(%i)", PARAM(0)); + + switch (utilityDialogState) { + case SCE_UTILITY_STATUS_FINISHED: + utilityDialogState = SCE_UTILITY_STATUS_SHUTDOWN; + break; + } + + if (utilityDialogState != SCE_UTILITY_STATUS_RUNNING) + { + RETURN(0); + return; + } + + pspMessageDialog messageDialog; + Memory::ReadStruct(messageDialogAddr, &messageDialog); + const char *text; + if (messageDialog.type == 0) { + char temp[256]; + sprintf(temp, "Error code: %08x", messageDialog.errorNum); + text = temp; + } else { + text = messageDialog.string; + } + + PPGeBegin(); + + PPGeDraw4Patch(I_BUTTON, 0, 0, 480, 272, 0xcFFFFFFF); + PPGeDrawText(text, 50, 50, PPGE_ALIGN_LEFT, 0.5f, 0xFFFFFFFF); + + static u32 lastButtons = 0; + u32 buttons = __CtrlPeekButtons(); + + if (messageDialog.options & 0x10) //yesnobutton + { + PPGeDrawImage(I_CROSS, 80, 220, 0, 0xFFFFFFFF); + PPGeDrawText("Yes", 140, 220, PPGE_ALIGN_HCENTER, 1.0f, 0xFFFFFFFF); + PPGeDrawImage(I_CIRCLE, 200, 220, 0, 0xFFFFFFFF); + PPGeDrawText("No", 260, 220, PPGE_ALIGN_HCENTER, 1.0f, 0xFFFFFFFF); + PPGeDrawImage(I_TRIANGLE, 320, 220, 0, 0xcFFFFFFF); + PPGeDrawText("Back", 380, 220, PPGE_ALIGN_HCENTER, 1.0f, 0xcFFFFFFF); + if (!lastButtons) { + if (buttons & CTRL_TRIANGLE) { + messageDialog.buttonPressed = 3; // back + utilityDialogState = SCE_UTILITY_STATUS_FINISHED; + } else if (buttons & CTRL_CROSS) { + messageDialog.buttonPressed = 1; + utilityDialogState = SCE_UTILITY_STATUS_FINISHED; + } else if (buttons & CTRL_CIRCLE) { + messageDialog.buttonPressed = 2; + utilityDialogState = SCE_UTILITY_STATUS_FINISHED; + } + } + } + else + { + PPGeDrawImage(I_CROSS, 150, 220, 0, 0xFFFFFFFF); + PPGeDrawText("OK", 480/2, 220, PPGE_ALIGN_HCENTER, 1.0f, 0xFFFFFFFF); + if (!lastButtons) { + if (buttons & (CTRL_CROSS | CTRL_CIRCLE)) { // accept both + messageDialog.buttonPressed = 1; + utilityDialogState = SCE_UTILITY_STATUS_FINISHED; + } + } + } + + lastButtons = buttons; + + Memory::WriteStruct(messageDialogAddr, &messageDialog); + + PPGeEnd(); + RETURN(0); } diff --git a/Core/Util/PPGeDraw.h b/Core/Util/PPGeDraw.h index 70018ba867..3ad719fe0e 100644 --- a/Core/Util/PPGeDraw.h +++ b/Core/Util/PPGeDraw.h @@ -55,11 +55,11 @@ enum { // These functions must be called between PPGeBegin and PPGeEnd. // Draws some text using the one font we have. -void PPGeDrawText(const char *text, float x, float y, int align, float scale, u32 color); +void PPGeDrawText(const char *text, float x, float y, int align, float scale = 1.0f, u32 color = 0xFFFFFFFF); // Draws a "4-patch" for button-like things that can be resized -void PPGeDraw4Patch(int atlasImage, float x, float y, float w, float h, u32 color); +void PPGeDraw4Patch(int atlasImage, float x, float y, float w, float h, u32 color = 0xFFFFFFFF); // Just blits an image to the screen, multiplied with the color. -void PPGeDrawImage(int atlasImage, float x, float y, int align, u32 color); +void PPGeDrawImage(int atlasImage, float x, float y, int align, u32 color = 0xFFFFFFFF); diff --git a/GPU/GLES/DisplayListInterpreter.cpp b/GPU/GLES/DisplayListInterpreter.cpp index 49e8b41bae..0bb6977e43 100644 --- a/GPU/GLES/DisplayListInterpreter.cpp +++ b/GPU/GLES/DisplayListInterpreter.cpp @@ -113,8 +113,8 @@ u32 GLES_GPU::EnqueueList(u32 listpc, u32 stall) { DisplayList dl; dl.id = dlIdGenerator++; - dl.listpc = listpc&0xFFFFFFF; - dl.stall = stall&0xFFFFFFF; + dl.listpc = listpc & 0xFFFFFFF; + dl.stall = stall & 0xFFFFFFF; dlQueue.push_back(dl); if (!ProcessDLQueue()) return dl.id; From 9ec858a64d18939da8b87ce10bdce1861f8f4124 Mon Sep 17 00:00:00 2001 From: Henrik Rydgard Date: Sun, 18 Nov 2012 18:47:29 +0100 Subject: [PATCH 05/12] Bugfix an 8-bit indexed texture format --- GPU/GLES/TextureCache.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GPU/GLES/TextureCache.cpp b/GPU/GLES/TextureCache.cpp index 90e4fa3cc7..680d004427 100644 --- a/GPU/GLES/TextureCache.cpp +++ b/GPU/GLES/TextureCache.cpp @@ -238,7 +238,7 @@ void *readIndexedTex(u32 level, u32 texaddr, u32 bytesPerIndex) u32 n = tmpTexBuf32[j]; u32 k; for (k = 0; k < 4; k++) { - u8 index = (n >> (k * 4)) & 0xff; + u8 index = (n >> (k * 8)) & 0xff; tmpTexBuf16[i + k] = clut[GetClutIndex(index)]; } } From 71a3b789b8d82c8053060d5f2a9a1c19d5face92 Mon Sep 17 00:00:00 2001 From: "kev :)" Date: Sun, 18 Nov 2012 19:33:19 +0000 Subject: [PATCH 06/12] Add fake methods that use sceGetCurrentTick --- Core/HLE/HLETables.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Core/HLE/HLETables.cpp b/Core/HLE/HLETables.cpp index d434d337ec..ae0f4d5bb8 100644 --- a/Core/HLE/HLETables.cpp +++ b/Core/HLE/HLETables.cpp @@ -98,8 +98,8 @@ const HLEFunction sceRtc[] = { {0xC41C2853, sceRtcGetTickResolution, "sceRtcGetTickResolution"}, {0x3f7ad767, sceRtcGetCurrentTick, "sceRtcGetCurrentTick"}, - {0x011F03C1, 0, "sceRtcGetAccumulativeTime"}, - {0x029CA3B3, 0, "sceRtcGetAccumlativeTime"}, + {0x011F03C1, sceRtcGetCurrentTick, "sceRtcGetAccumulativeTime"}, + {0x029CA3B3, sceRtcGetCurrentTick, "sceRtcGetAccumlativeTime"}, {0x4cfa57b0, 0, "sceRtcGetCurrentClock"}, {0xE7C27D1B, sceRtcGetCurrentClockLocalTime, "sceRtcGetCurrentClockLocalTime"}, {0x34885E0D, 0, "sceRtcConvertUtcToLocalTime"}, From 48bd2ccc083af4e4970904cd0300ba881cbea892 Mon Sep 17 00:00:00 2001 From: "kev :)" Date: Sun, 18 Nov 2012 19:34:10 +0000 Subject: [PATCH 07/12] Attempt at UMD callbacks. Helps a few games but needs more work. --- Core/HLE/sceUmd.cpp | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/Core/HLE/sceUmd.cpp b/Core/HLE/sceUmd.cpp index f520f78e8b..2eb6a27c27 100644 --- a/Core/HLE/sceUmd.cpp +++ b/Core/HLE/sceUmd.cpp @@ -31,6 +31,7 @@ u8 umdActivated = 1; u32 umdStatus = 0; u32 umdErrorStat = 0; +static u32 driveCBId; #define PSP_UMD_TYPE_GAME 0x10 @@ -120,6 +121,7 @@ u32 sceUmdDeactivate(u32 unknown, const char *name) u32 sceUmdRegisterUMDCallBack(u32 cbId) { DEBUG_LOG(HLE,"0=sceUmdRegisterUMDCallback(id=%i)",PARAM(0)); + driveCBId = cbId; return __KernelRegisterCallback(THREAD_CALLBACK_UMD, cbId); } @@ -148,24 +150,30 @@ void sceUmdWaitDriveStat() { u32 stat = PARAM(0); ERROR_LOG(HLE,"UNIMPL 0=sceUmdWaitDriveStat(stat = %08x)", stat); - //if ((stat & __KernelUmdGetState()) != stat) - // __KernelWaitCurThread(WAITTYPE_UMD, 0, stat, 0, 0); //__KernelWaitCurThread(WAITTYPE_UMD, 0); + if ((stat & __KernelUmdGetState()) != stat) + __KernelWaitCurThread(WAITTYPE_UMD, 0, stat, 0, 0); //__KernelWaitCurThread(WAITTYPE_UMD, 0); RETURN(0); } void sceUmdWaitDriveStatWithTimer() { u32 stat = PARAM(0); + u32 timeout = PARAM(1); ERROR_LOG(HLE,"UNIMPL 0=sceUmdWaitDriveStatWithTimer(stat = %08x)", stat); - //__KernelWaitCurThread(WAITTYPE_UMD, 0); - RETURN(0); + if ((stat & __KernelUmdGetState()) != stat) + __KernelWaitCurThread(WAITTYPE_UMD, 0, stat, 0, 0); //__KernelWaitCurThread(WAITTYPE_UMD, 0); + RETURN(stat); } + void sceUmdWaitDriveStatCB() { u32 stat = PARAM(0); ERROR_LOG(HLE,"UNIMPL 0=sceUmdWaitDriveStatCB(stat = %08x)", stat); - //__KernelWaitCurThread(WAITTYPE_UMD, 0); + //__KernelRegisterCallback(THREAD_CALLBACK_UMD, cbid); + // Immediately notify + RETURN(0); + __KernelNotifyCallbackType(THREAD_CALLBACK_UMD, driveCBId, __KernelUmdGetState()&stat); RETURN(0); } From 9257b28c15ef3b4c5819422146fa51182a993465 Mon Sep 17 00:00:00 2001 From: "kev :)" Date: Sun, 18 Nov 2012 19:34:53 +0000 Subject: [PATCH 08/12] Limit thread name Seems this needs to be limited --- Core/HLE/sceKernelThread.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Core/HLE/sceKernelThread.cpp b/Core/HLE/sceKernelThread.cpp index e2b8105325..1e1bcf719f 100644 --- a/Core/HLE/sceKernelThread.cpp +++ b/Core/HLE/sceKernelThread.cpp @@ -1288,8 +1288,8 @@ u32 __KernelCreateCallback(const char *name, u32 entrypoint, u32 commonArg) SceUID id = kernelObjects.Create(cb); cb->nc.size = sizeof(NativeCallback); - strcpy(cb->nc.name, name); - + strncpy(cb->nc.name, name, 32); + cb->nc.entrypoint = entrypoint; cb->nc.threadId = __KernelGetCurThread(); cb->nc.commonArgument = commonArg; From 03bc871f56369f4259a5f92e0d47eeb0d15c99fd Mon Sep 17 00:00:00 2001 From: "kev :)" Date: Sun, 18 Nov 2012 20:13:27 +0000 Subject: [PATCH 09/12] sceDisplayWaitVblankStartMultiCB() This is wrong but better than having nothing in the method. The one game I have found that uses this seems to be ok with this implementation. --- Core/HLE/sceDisplay.cpp | 9 ++++++++- Core/HLE/sceUmd.cpp | 9 ++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Core/HLE/sceDisplay.cpp b/Core/HLE/sceDisplay.cpp index e494e3e74e..7056903cc7 100644 --- a/Core/HLE/sceDisplay.cpp +++ b/Core/HLE/sceDisplay.cpp @@ -259,6 +259,13 @@ void sceDisplayWaitVblankStartCB() __KernelCheckCallbacks(); } +void sceDisplayWaitVblankStartMultiCB() +{ + DEBUG_LOG(HLE,"sceDisplayWaitVblankStartMultiCB()"); + __KernelWaitCurThread(WAITTYPE_VBLANK, 0, 0, 0, true); + __KernelCheckCallbacks(); +} + void sceDisplayGetVcount() { // Too spammy @@ -297,7 +304,7 @@ const HLEFunction sceDisplay[] = {0x984C27E7,sceDisplayWaitVblankStart, "sceDisplayWaitVblankStart"}, {0x8EB9EC49,sceDisplayWaitVblankCB, "sceDisplayWaitVblankCB"}, {0x46F186C3,sceDisplayWaitVblankStartCB, "sceDisplayWaitVblankStartCB"}, - {0x77ed8b3a,0,"sceDisplayWaitVblankStartMultiCB"}, + {0x77ed8b3a,sceDisplayWaitVblankStartMultiCB,"sceDisplayWaitVblankStartMultiCB"}, {0xdba6c4c4,&WrapF_V,"sceDisplayGetFramePerSec"}, {0x773dd3a3,sceDisplayGetCurrentHcount,"sceDisplayGetCurrentHcount"}, diff --git a/Core/HLE/sceUmd.cpp b/Core/HLE/sceUmd.cpp index 2eb6a27c27..c7b521e399 100644 --- a/Core/HLE/sceUmd.cpp +++ b/Core/HLE/sceUmd.cpp @@ -149,7 +149,7 @@ u32 sceUmdGetDriveStat() void sceUmdWaitDriveStat() { u32 stat = PARAM(0); - ERROR_LOG(HLE,"UNIMPL 0=sceUmdWaitDriveStat(stat = %08x)", stat); + DEBUG_LOG(HLE,"HACK 0=sceUmdWaitDriveStat(stat = %08x)", stat); if ((stat & __KernelUmdGetState()) != stat) __KernelWaitCurThread(WAITTYPE_UMD, 0, stat, 0, 0); //__KernelWaitCurThread(WAITTYPE_UMD, 0); RETURN(0); @@ -159,18 +159,17 @@ void sceUmdWaitDriveStatWithTimer() { u32 stat = PARAM(0); u32 timeout = PARAM(1); - ERROR_LOG(HLE,"UNIMPL 0=sceUmdWaitDriveStatWithTimer(stat = %08x)", stat); + DEBUG_LOG(HLE,"HACK 0=sceUmdWaitDriveStatWithTimer(stat = %08x)", stat); if ((stat & __KernelUmdGetState()) != stat) __KernelWaitCurThread(WAITTYPE_UMD, 0, stat, 0, 0); //__KernelWaitCurThread(WAITTYPE_UMD, 0); - RETURN(stat); + RETURN(0); } void sceUmdWaitDriveStatCB() { u32 stat = PARAM(0); - ERROR_LOG(HLE,"UNIMPL 0=sceUmdWaitDriveStatCB(stat = %08x)", stat); - //__KernelRegisterCallback(THREAD_CALLBACK_UMD, cbid); + DEBUG_LOG(HLE,"HACK 0=sceUmdWaitDriveStatCB(stat = %08x)", stat); // Immediately notify RETURN(0); __KernelNotifyCallbackType(THREAD_CALLBACK_UMD, driveCBId, __KernelUmdGetState()&stat); From 7c3064660589f42ccd0488792e46ed01dc4af197 Mon Sep 17 00:00:00 2001 From: "kev :)" Date: Sun, 18 Nov 2012 21:07:40 +0000 Subject: [PATCH 10/12] Don't append / when there is already one Was causing marvel allience 2 to crash --- Core/FileSystems/MetaFileSystem.cpp | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/Core/FileSystems/MetaFileSystem.cpp b/Core/FileSystems/MetaFileSystem.cpp index 3427ceef4b..7ca1a9a619 100644 --- a/Core/FileSystems/MetaFileSystem.cpp +++ b/Core/FileSystems/MetaFileSystem.cpp @@ -116,12 +116,25 @@ PSPFileInfo MetaFileSystem::GetFileInfo(std::string filename) } } +//TODO: Not sure where this should live. Seems a bit wrong putting it in common +bool stringEndsWith (std::string const &fullString, std::string const &ending) +{ + if (fullString.length() >= ending.length()) { + return (0 == fullString.compare (fullString.length() - ending.length(), ending.length(), ending)); + } else { + return false; + } +} + std::vector MetaFileSystem::GetDirListing(std::string path) { std::string of; if (path.find(':') == std::string::npos) { - path = currentDirectory + "/" + path; + if (!stringEndsWith(currentDirectory, "/")) + { + path = currentDirectory + "/" + path; + } DEBUG_LOG(HLE,"GetFileInfo: Expanded path to %s", path.c_str()); } IFileSystem *system; From d04fb7cb50a597bb081a7dff02edb0ef8bf6d522 Mon Sep 17 00:00:00 2001 From: "kev :)" Date: Sun, 18 Nov 2012 21:28:26 +0000 Subject: [PATCH 11/12] A bit more clean up on umd callbacks Just error checking based on some tests --- Core/HLE/sceUmd.cpp | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/Core/HLE/sceUmd.cpp b/Core/HLE/sceUmd.cpp index c7b521e399..81929ca7e6 100644 --- a/Core/HLE/sceUmd.cpp +++ b/Core/HLE/sceUmd.cpp @@ -31,7 +31,7 @@ u8 umdActivated = 1; u32 umdStatus = 0; u32 umdErrorStat = 0; -static u32 driveCBId; +static int driveCBId= -1; #define PSP_UMD_TYPE_GAME 0x10 @@ -47,6 +47,7 @@ void __UmdInit() { umdActivated = 1; umdStatus = 0; umdErrorStat = 0; + driveCBId = -1; } u8 __KernelUmdGetState() @@ -121,13 +122,21 @@ u32 sceUmdDeactivate(u32 unknown, const char *name) u32 sceUmdRegisterUMDCallBack(u32 cbId) { DEBUG_LOG(HLE,"0=sceUmdRegisterUMDCallback(id=%i)",PARAM(0)); - driveCBId = cbId; + if (driveCBId == -1) + { + driveCBId = cbId; + } + else + { + ERROR_LOG(HLE," 0=sceUmdRegisterUMDCallback(id=%i) callback overwrite attempt",PARAM(0)); + } return __KernelRegisterCallback(THREAD_CALLBACK_UMD, cbId); } u32 sceUmdUnRegisterUMDCallBack(u32 cbId) { DEBUG_LOG(HLE,"0=sceUmdUnRegisterUMDCallBack(id=%i)",PARAM(0)); + driveCBId = -1; return __KernelUnregisterCallback(THREAD_CALLBACK_UMD, cbId); } @@ -172,7 +181,14 @@ void sceUmdWaitDriveStatCB() DEBUG_LOG(HLE,"HACK 0=sceUmdWaitDriveStatCB(stat = %08x)", stat); // Immediately notify RETURN(0); - __KernelNotifyCallbackType(THREAD_CALLBACK_UMD, driveCBId, __KernelUmdGetState()&stat); + if (driveCBId != -1) + { + __KernelNotifyCallbackType(THREAD_CALLBACK_UMD, driveCBId, __KernelUmdGetState()&stat); + } + else + { + ERROR_LOG(HLE, "HACK 0=sceUmdWaitDriveStatCB(stat = %08x) attempting to call unset callback", stat); + } RETURN(0); } From bcb0cbe7eae444d7516e823bc8040e3527ef32dc Mon Sep 17 00:00:00 2001 From: "kev :)" Date: Sun, 18 Nov 2012 21:45:14 +0000 Subject: [PATCH 12/12] make sceUtilitySavedataInitStart return 0 Makes a few other games get further --- Core/HLE/sceUtility.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Core/HLE/sceUtility.cpp b/Core/HLE/sceUtility.cpp index 63dafa1d88..e67f4f61d1 100644 --- a/Core/HLE/sceUtility.cpp +++ b/Core/HLE/sceUtility.cpp @@ -198,7 +198,7 @@ void sceUtilitySavedataInitStart() { SceUtilitySavedataParam *param = (SceUtilitySavedataParam*)Memory::GetPointer(PARAM(0)); - DEBUG_LOG(HLE,"sceUtilitySavedataInitStart(%08x)", PARAM(0)); + DEBUG_LOG(HLE,"sceUtilitySavedataInitStart(%08x)", PARAM(0)); DEBUG_LOG(HLE,"Mode: %i", param->mode); if (param->mode == 0) //load { @@ -214,9 +214,11 @@ void sceUtilitySavedataInitStart() __UtilityInitStart(); + // Returning 0 here breaks Bust a Move Deluxe! But should be the right thing to do... + // At least Cohort Chess expects this to return 0 or it locks up.. // The fix is probably to fully implement sceUtility so that it actually works. - // RETURN(0); + RETURN(0); } void sceUtilitySavedataShutdownStart()