mirror of
https://github.com/hrydgard/ppsspp.git
synced 2024-11-26 23:10:38 +00:00
Global: Cleanup some minor includes and typos.
This commit is contained in:
parent
2daba57c79
commit
0496ca32ff
@ -1612,7 +1612,6 @@ set(GPU_SOURCES
|
|||||||
GPU/Common/TextureScalerCommon.h
|
GPU/Common/TextureScalerCommon.h
|
||||||
GPU/Common/PostShader.cpp
|
GPU/Common/PostShader.cpp
|
||||||
GPU/Common/PostShader.h
|
GPU/Common/PostShader.h
|
||||||
GPU/Common/SplineCommon.h
|
|
||||||
GPU/Debugger/Breakpoints.cpp
|
GPU/Debugger/Breakpoints.cpp
|
||||||
GPU/Debugger/Breakpoints.h
|
GPU/Debugger/Breakpoints.h
|
||||||
GPU/Debugger/Debugger.cpp
|
GPU/Debugger/Debugger.cpp
|
||||||
@ -1661,7 +1660,6 @@ set(GPU_SOURCES
|
|||||||
GPU/Software/SoftGpu.h
|
GPU/Software/SoftGpu.h
|
||||||
GPU/Software/TransformUnit.cpp
|
GPU/Software/TransformUnit.cpp
|
||||||
GPU/Software/TransformUnit.h
|
GPU/Software/TransformUnit.h
|
||||||
GPU/ge_constants.h
|
|
||||||
)
|
)
|
||||||
|
|
||||||
# 'ppsspp_jni' on ANDROID, 'Core' everywhere else
|
# 'ppsspp_jni' on ANDROID, 'Core' everywhere else
|
||||||
|
@ -3,8 +3,6 @@
|
|||||||
#include <cstring>
|
#include <cstring>
|
||||||
|
|
||||||
#include "Common/GPU/Shader.h"
|
#include "Common/GPU/Shader.h"
|
||||||
#include "GPU/ge_constants.h"
|
|
||||||
#include "GPU/GPUCommon.h"
|
|
||||||
#include "Common/Data/Collections/Slice.h"
|
#include "Common/Data/Collections/Slice.h"
|
||||||
|
|
||||||
#include "Common/GPU/thin3d.h"
|
#include "Common/GPU/thin3d.h"
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
// Rough and ready CwCheats implementation, disabled by default.
|
// Rough and ready CwCheats implementation, disabled by default.
|
||||||
// Will not enable by default until the TOOD:s have been addressed.
|
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
@ -1018,7 +1018,7 @@ static int Hook_kumonohatateni_download_frame() {
|
|||||||
if (Memory::IsVRAMAddress(fb_address)) {
|
if (Memory::IsVRAMAddress(fb_address)) {
|
||||||
gpu->PerformReadbackToMemory(fb_address, 0x00088000);
|
gpu->PerformReadbackToMemory(fb_address, 0x00088000);
|
||||||
NotifyMemInfo(MemBlockFlags::WRITE, fb_address, 0x00088000, "kumonohatateni_download_frame");
|
NotifyMemInfo(MemBlockFlags::WRITE, fb_address, 0x00088000, "kumonohatateni_download_frame");
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1027,7 +1027,7 @@ static int Hook_otomenoheihou_download_frame() {
|
|||||||
if (Memory::IsVRAMAddress(fb_address)) {
|
if (Memory::IsVRAMAddress(fb_address)) {
|
||||||
gpu->PerformReadbackToMemory(fb_address, 0x00088000);
|
gpu->PerformReadbackToMemory(fb_address, 0x00088000);
|
||||||
NotifyMemInfo(MemBlockFlags::WRITE, fb_address, 0x00088000, "otomenoheihou_download_frame");
|
NotifyMemInfo(MemBlockFlags::WRITE, fb_address, 0x00088000, "otomenoheihou_download_frame");
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1054,7 +1054,7 @@ static int Hook_toheart2_download_frame() {
|
|||||||
if (Memory::IsVRAMAddress(fb_address)) {
|
if (Memory::IsVRAMAddress(fb_address)) {
|
||||||
gpu->PerformReadbackToMemory(fb_address, 0x00044000);
|
gpu->PerformReadbackToMemory(fb_address, 0x00044000);
|
||||||
NotifyMemInfo(MemBlockFlags::WRITE, fb_address, 0x00044000, "toheart2_download_frame");
|
NotifyMemInfo(MemBlockFlags::WRITE, fb_address, 0x00044000, "toheart2_download_frame");
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2173,7 +2173,7 @@ static u32 sceIoSetAsyncCallback(int id, u32 clbckId, u32 clbckArg)
|
|||||||
static u32 sceIoOpenAsync(const char *filename, int flags, int mode) {
|
static u32 sceIoOpenAsync(const char *filename, int flags, int mode) {
|
||||||
hleEatCycles(18000);
|
hleEatCycles(18000);
|
||||||
|
|
||||||
// TOOD: Use an internal method so as not to pollute the log?
|
// TODO: Use an internal method so as not to pollute the log?
|
||||||
// Intentionally does not work when interrupts disabled.
|
// Intentionally does not work when interrupts disabled.
|
||||||
if (!__KernelIsDispatchEnabled())
|
if (!__KernelIsDispatchEnabled())
|
||||||
sceKernelResumeDispatchThread(1);
|
sceKernelResumeDispatchThread(1);
|
||||||
|
@ -59,7 +59,6 @@
|
|||||||
#include "sceKernelMutex.h"
|
#include "sceKernelMutex.h"
|
||||||
#include "sceKernelMbx.h"
|
#include "sceKernelMbx.h"
|
||||||
#include "sceKernelMsgPipe.h"
|
#include "sceKernelMsgPipe.h"
|
||||||
#include "sceKernelInterrupt.h"
|
|
||||||
#include "sceKernelSemaphore.h"
|
#include "sceKernelSemaphore.h"
|
||||||
#include "sceKernelEventFlag.h"
|
#include "sceKernelEventFlag.h"
|
||||||
#include "sceKernelVTimer.h"
|
#include "sceKernelVTimer.h"
|
||||||
|
@ -610,7 +610,7 @@ void __KernelFplEndCallback(SceUID threadID, SceUID prevCallbackId)
|
|||||||
{
|
{
|
||||||
auto result = HLEKernel::WaitEndCallback<FPL, WAITTYPE_FPL, FplWaitingThread>(threadID, prevCallbackId, fplWaitTimer, __KernelUnlockFplForThread);
|
auto result = HLEKernel::WaitEndCallback<FPL, WAITTYPE_FPL, FplWaitingThread>(threadID, prevCallbackId, fplWaitTimer, __KernelUnlockFplForThread);
|
||||||
if (result == HLEKernel::WAIT_CB_RESUMED_WAIT)
|
if (result == HLEKernel::WAIT_CB_RESUMED_WAIT)
|
||||||
DEBUG_LOG(SCEKERNEL, "sceKernelReceiveMbxCB: Resuming mbx wait from callback");
|
DEBUG_LOG(SCEKERNEL, "sceKernelAllocateFplCB: Resuming mbx wait from callback");
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool __FplThreadSortPriority(FplWaitingThread thread1, FplWaitingThread thread2)
|
static bool __FplThreadSortPriority(FplWaitingThread thread1, FplWaitingThread thread2)
|
||||||
@ -1452,7 +1452,7 @@ void __KernelVplEndCallback(SceUID threadID, SceUID prevCallbackId)
|
|||||||
{
|
{
|
||||||
auto result = HLEKernel::WaitEndCallback<VPL, WAITTYPE_VPL, VplWaitingThread>(threadID, prevCallbackId, vplWaitTimer, __KernelUnlockVplForThread);
|
auto result = HLEKernel::WaitEndCallback<VPL, WAITTYPE_VPL, VplWaitingThread>(threadID, prevCallbackId, vplWaitTimer, __KernelUnlockVplForThread);
|
||||||
if (result == HLEKernel::WAIT_CB_RESUMED_WAIT)
|
if (result == HLEKernel::WAIT_CB_RESUMED_WAIT)
|
||||||
DEBUG_LOG(SCEKERNEL, "sceKernelReceiveMbxCB: Resuming mbx wait from callback");
|
DEBUG_LOG(SCEKERNEL, "sceKernelAllocateVplCB: Resuming mbx wait from callback");
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool __VplThreadSortPriority(VplWaitingThread thread1, VplWaitingThread thread2)
|
static bool __VplThreadSortPriority(VplWaitingThread thread1, VplWaitingThread thread2)
|
||||||
|
@ -44,7 +44,6 @@
|
|||||||
#include "Core/MIPS/JitCommon/JitBlockCache.h"
|
#include "Core/MIPS/JitCommon/JitBlockCache.h"
|
||||||
#include "Core/MIPS/JitCommon/JitCommon.h"
|
#include "Core/MIPS/JitCommon/JitCommon.h"
|
||||||
#include "Common/Thread/ParallelLoop.h"
|
#include "Common/Thread/ParallelLoop.h"
|
||||||
#include "UI/OnScreenDisplay.h"
|
|
||||||
|
|
||||||
namespace Memory {
|
namespace Memory {
|
||||||
|
|
||||||
|
@ -42,10 +42,6 @@
|
|||||||
#include "GPU/D3D11/TextureCacheD3D11.h"
|
#include "GPU/D3D11/TextureCacheD3D11.h"
|
||||||
#include "GPU/D3D11/D3D11Util.h"
|
#include "GPU/D3D11/D3D11Util.h"
|
||||||
|
|
||||||
#include "Core/HLE/sceKernelThread.h"
|
|
||||||
#include "Core/HLE/sceKernelInterrupt.h"
|
|
||||||
#include "Core/HLE/sceGe.h"
|
|
||||||
|
|
||||||
GPU_D3D11::GPU_D3D11(GraphicsContext *gfxCtx, Draw::DrawContext *draw)
|
GPU_D3D11::GPU_D3D11(GraphicsContext *gfxCtx, Draw::DrawContext *draw)
|
||||||
: GPUCommon(gfxCtx, draw), drawEngine_(draw,
|
: GPUCommon(gfxCtx, draw), drawEngine_(draw,
|
||||||
(ID3D11Device *)draw->GetNativeObject(Draw::NativeObject::DEVICE),
|
(ID3D11Device *)draw->GetNativeObject(Draw::NativeObject::DEVICE),
|
||||||
|
@ -44,10 +44,6 @@
|
|||||||
#include "GPU/Directx9/DrawEngineDX9.h"
|
#include "GPU/Directx9/DrawEngineDX9.h"
|
||||||
#include "GPU/Directx9/TextureCacheDX9.h"
|
#include "GPU/Directx9/TextureCacheDX9.h"
|
||||||
|
|
||||||
#include "Core/HLE/sceKernelThread.h"
|
|
||||||
#include "Core/HLE/sceKernelInterrupt.h"
|
|
||||||
#include "Core/HLE/sceGe.h"
|
|
||||||
|
|
||||||
GPU_DX9::GPU_DX9(GraphicsContext *gfxCtx, Draw::DrawContext *draw)
|
GPU_DX9::GPU_DX9(GraphicsContext *gfxCtx, Draw::DrawContext *draw)
|
||||||
: GPUCommon(gfxCtx, draw),
|
: GPUCommon(gfxCtx, draw),
|
||||||
drawEngine_(draw) {
|
drawEngine_(draw) {
|
||||||
|
@ -43,11 +43,6 @@
|
|||||||
#include "GPU/GLES/DrawEngineGLES.h"
|
#include "GPU/GLES/DrawEngineGLES.h"
|
||||||
#include "GPU/GLES/TextureCacheGLES.h"
|
#include "GPU/GLES/TextureCacheGLES.h"
|
||||||
|
|
||||||
#include "Core/MIPS/MIPS.h"
|
|
||||||
#include "Core/HLE/sceKernelThread.h"
|
|
||||||
#include "Core/HLE/sceKernelInterrupt.h"
|
|
||||||
#include "Core/HLE/sceGe.h"
|
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
#include "Windows/GPU/WindowsGLContext.h"
|
#include "Windows/GPU/WindowsGLContext.h"
|
||||||
#endif
|
#endif
|
||||||
|
@ -45,11 +45,6 @@
|
|||||||
#include "Common/GPU/Vulkan/VulkanRenderManager.h"
|
#include "Common/GPU/Vulkan/VulkanRenderManager.h"
|
||||||
#include "Common/GPU/Vulkan/VulkanQueueRunner.h"
|
#include "Common/GPU/Vulkan/VulkanQueueRunner.h"
|
||||||
|
|
||||||
#include "Core/MIPS/MIPS.h"
|
|
||||||
#include "Core/HLE/sceKernelThread.h"
|
|
||||||
#include "Core/HLE/sceKernelInterrupt.h"
|
|
||||||
#include "Core/HLE/sceGe.h"
|
|
||||||
|
|
||||||
GPU_Vulkan::GPU_Vulkan(GraphicsContext *gfxCtx, Draw::DrawContext *draw)
|
GPU_Vulkan::GPU_Vulkan(GraphicsContext *gfxCtx, Draw::DrawContext *draw)
|
||||||
: GPUCommon(gfxCtx, draw), drawEngine_(draw) {
|
: GPUCommon(gfxCtx, draw), drawEngine_(draw) {
|
||||||
gstate_c.SetUseFlags(CheckGPUFeatures());
|
gstate_c.SetUseFlags(CheckGPUFeatures());
|
||||||
|
Loading…
Reference in New Issue
Block a user