diff --git a/Core/Core.cpp b/Core/Core.cpp index a65c17e944..d549d79c4f 100644 --- a/Core/Core.cpp +++ b/Core/Core.cpp @@ -177,7 +177,7 @@ bool UpdateScreenScale(int width, int height) { dp_yres = new_dp_yres; pixel_xres = width; pixel_yres = height; - INFO_LOG(SYSTEM, "pixel_res: %dx%d. Calling NativeResized()", pixel_xres, pixel_yres); + DEBUG_LOG(SYSTEM, "pixel_res: %dx%d. Calling NativeResized()", pixel_xres, pixel_yres); NativeResized(); return true; } diff --git a/Core/HLE/sceKernelModule.cpp b/Core/HLE/sceKernelModule.cpp index 47a9ae7d84..adda9bd383 100644 --- a/Core/HLE/sceKernelModule.cpp +++ b/Core/HLE/sceKernelModule.cpp @@ -1577,6 +1577,7 @@ void __KernelLoadReset() { HLEShutdown(); Replacement_Init(); HLEInit(); + assert(gpu); gpu->Reinitialize(); } diff --git a/GPU/Common/DrawEngineCommon.cpp b/GPU/Common/DrawEngineCommon.cpp index 1f6a44eda2..abba527ef2 100644 --- a/GPU/Common/DrawEngineCommon.cpp +++ b/GPU/Common/DrawEngineCommon.cpp @@ -330,11 +330,12 @@ bool DrawEngineCommon::GetCurrentSimpleVertices(int count, std::vector> GE_VTYPE_IDX_SHIFT; dc.prim = prim; dc.vertexCount = vertexCount; if (g_Config.bVertexCache) { u32 dhash = dcid_; - dhash ^= (u32)(uintptr_t)verts; - dhash = __rotl(dhash, 13); - dhash ^= (u32)(uintptr_t)inds; - dhash = __rotl(dhash, 13); - dhash ^= (u32)vertType; - dhash = __rotl(dhash, 13); - dhash ^= (u32)vertexCount; - dhash = __rotl(dhash, 13); - dhash ^= (u32)prim; - dcid_ = dhash; + dhash = __rotl(dhash ^ (u32)(uintptr_t)verts, 13); + dhash = __rotl(dhash ^ (u32)(uintptr_t)inds, 13); + dhash = __rotl(dhash ^ (u32)vertType, 13); + dhash = __rotl(dhash ^ (u32)vertexCount, 13); + dcid_ = dhash ^ (u32)prim;; } if (inds) { diff --git a/GPU/Common/DrawEngineCommon.h b/GPU/Common/DrawEngineCommon.h index b99bc12cea..64ef9ae9dc 100644 --- a/GPU/Common/DrawEngineCommon.h +++ b/GPU/Common/DrawEngineCommon.h @@ -132,7 +132,6 @@ protected: struct DeferredDrawCall { void *verts; void *inds; - u32 vertType; u8 indexType; s8 prim; u32 vertexCount; diff --git a/GPU/GPUCommon.h b/GPU/GPUCommon.h index e520b38e15..5b6b78ce43 100644 --- a/GPU/GPUCommon.h +++ b/GPU/GPUCommon.h @@ -32,7 +32,7 @@ enum DrawType { enum { FLAG_FLUSHBEFORE = 1, FLAG_FLUSHBEFOREONCHANGE = 2, - FLAG_EXECUTE = 4, // needs to actually be executed. unused for now. + FLAG_EXECUTE = 4, FLAG_EXECUTEONCHANGE = 8, FLAG_READS_PC = 16, FLAG_WRITES_PC = 32, diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp index 7c95f1388d..59344be74e 100644 --- a/UI/NativeApp.cpp +++ b/UI/NativeApp.cpp @@ -1107,7 +1107,7 @@ void NativeShutdown() { #endif g_Config.Save(); - // Avoid shutting this down when restaring core. + // Avoid shutting this down when restarting core. if (!restarting) LogManager::Shutdown(); diff --git a/Windows/MainWindow.cpp b/Windows/MainWindow.cpp index 11edd34f7a..f15bcfe3a5 100644 --- a/Windows/MainWindow.cpp +++ b/Windows/MainWindow.cpp @@ -263,8 +263,6 @@ namespace MainWindow // Moves the internal display window to match the inner size of the main window. MoveWindow(hwndDisplay, 0, 0, width, height, TRUE); - INFO_LOG(SYSTEM, "New width/height: %dx%d", width, height); - // Setting pixelWidth to be too small could have odd consequences. if (width >= 4 && height >= 4) { // The framebuffer manager reads these once per frame, hopefully safe enough.. should really use a mutex or some @@ -273,7 +271,7 @@ namespace MainWindow PSP_CoreParameter().pixelHeight = height; } - INFO_LOG(SYSTEM, "Pixel width/height: %dx%d", PSP_CoreParameter().pixelWidth, PSP_CoreParameter().pixelHeight); + DEBUG_LOG(SYSTEM, "Pixel width/height: %dx%d", PSP_CoreParameter().pixelWidth, PSP_CoreParameter().pixelHeight); if (UpdateScreenScale(width, height)) { NativeMessageReceived("gpu_resized", "");