Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-03-09 01:13:33 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Another minor cleanup (DescribeCodePtr)

Browse Source
This commit is contained in:
Henrik Rydgård 2017-10-20 11:06:06 +02:00
parent 4a30aedc53
commit b886efe8f5
13 changed files with 18 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
GPU/Common/DrawEngineCommon.h
View File

@ -71,6 +71,10 @@ public:
void SetupVertexDecoder(u32 vertType);
bool IsCodePtrVertexDecoder(const u8 *ptr) const {
return decJitCache_->IsInSpace(ptr);
}
protected:
virtual void ClearTrackedVertexArrays() {}

4
GPU/D3D11/DrawEngineD3D11.cpp
View File

@ -786,10 +786,6 @@ rotateVBO:
#endif
}
bool DrawEngineD3D11::IsCodePtrVertexDecoder(const u8 *ptr) const {
return decJitCache_->IsInSpace(ptr);
}
void DrawEngineD3D11::TessellationDataTransferD3D11::SendDataToShader(const float * pos, const float * tex, const float * col, int size, bool hasColor, bool hasTexCoords) {
// Position
if (prevSize < size) {

2
GPU/D3D11/DrawEngineD3D11.h
View File

@ -136,8 +136,6 @@ public:
DecodeVerts();
}
bool IsCodePtrVertexDecoder(const u8 *ptr) const;
void DispatchFlush() override { Flush(); }
void DispatchSubmitPrim(void *verts, void *inds, GEPrimitiveType prim, int vertexCount, u32 vertType, int *bytesRead) override {
SubmitPrim(verts, inds, prim, vertexCount, vertType, bytesRead);

4
GPU/Directx9/DrawEngineDX9.cpp
View File

@ -707,10 +707,6 @@ rotateVBO:
host->GPUNotifyDraw();
}
bool DrawEngineDX9::IsCodePtrVertexDecoder(const u8 *ptr) const {
return decJitCache_->IsInSpace(ptr);
}
void DrawEngineDX9::TessellationDataTransferDX9::SendDataToShader(const float * pos, const float * tex, const float * col, int size, bool hasColor, bool hasTexCoords)
{
}

2
GPU/Directx9/DrawEngineDX9.h
View File

@ -133,8 +133,6 @@ public:
DecodeVerts();
}
bool IsCodePtrVertexDecoder(const u8 *ptr) const;
void DispatchFlush() override { Flush(); }
void DispatchSubmitPrim(void *verts, void *inds, GEPrimitiveType prim, int vertexCount, u32 vertType, int *bytesRead) override {
SubmitPrim(verts, inds, prim, vertexCount, vertType, bytesRead);

8
GPU/GLES/GPU_GLES.cpp
View File

@ -946,14 +946,6 @@ void GPU_GLES::DoState(PointerWrap &p) {
}
}
bool GPU_GLES::DescribeCodePtr(const u8 *ptr, std::string &name) {
if (drawEngine_.IsCodePtrVertexDecoder(ptr)) {
name = "VertexDecoderJit";
return true;
}
return false;
}
std::vector<std::string> GPU_GLES::DebugGetShaderIDs(DebugShaderType type) {
switch (type) {
case SHADER_TYPE_VERTEXLOADER:

2
GPU/GLES/GPU_GLES.h
View File

@ -64,8 +64,6 @@ public:
fullInfo = reportingFullInfo_;
}
bool DescribeCodePtr(const u8 *ptr, std::string &name) override;
typedef void (GPU_GLES::*CmdFunc)(u32 op, u32 diff);
struct CommandInfo {
uint64_t flags;

8
GPU/GPUCommon.cpp
View File

@ -2521,3 +2521,11 @@ bool GPUCommon::GetCurrentTexture(GPUDebugBuffer &buffer, int level) {
}
return textureCache_->GetCurrentTextureDebug(buffer, level);
}
bool GPUCommon::DescribeCodePtr(const u8 *ptr, std::string &name) {
if (drawEngineCommon_->IsCodePtrVertexDecoder(ptr)) {
name = "VertexDecoderJit";
return true;
}
return false;
}

15
GPU/GPUCommon.h
View File

@ -169,10 +169,6 @@ public:
#define new DBG_NEW
#endif
bool DescribeCodePtr(const u8 *ptr, std::string &name) override {
return false;
}
// From GPUDebugInterface.
bool GetCurrentDisplayList(DisplayList &list) override;
bool GetCurrentFramebuffer(GPUDebugBuffer &buffer, GPUDebugFramebufferType type, int maxRes) override;
@ -183,6 +179,12 @@ public:
bool GetCurrentSimpleVertices(int count, std::vector<GPUDebugVertex> &vertices, std::vector<u16> &indices) override;
bool GetOutputFramebuffer(GPUDebugBuffer &buffer) override;
std::vector<std::string> DebugGetShaderIDs(DebugShaderType shader) override { return std::vector<std::string>(); };
std::string DebugGetShaderString(std::string id, DebugShaderType shader, DebugShaderStringType stringType) override {
return "N/A";
}
bool DescribeCodePtr(const u8 *ptr, std::string &name);
std::vector<DisplayList> ActiveDisplayLists() override;
void ResetListPC(int listID, u32 pc) override;
void ResetListStall(int listID, u32 stall) override;
@ -236,11 +238,6 @@ public:
return -1;
}
std::vector<std::string> DebugGetShaderIDs(DebugShaderType shader) override { return std::vector<std::string>(); };
std::string DebugGetShaderString(std::string id, DebugShaderType shader, DebugShaderStringType stringType) override {
return "N/A";
}
typedef void (GPUCommon::*CmdFunc)(u32 op, u32 diff);
protected:

4
GPU/Vulkan/DrawEngineVulkan.cpp
View File

@ -1078,10 +1078,6 @@ void DrawEngineVulkan::UpdateUBOs(FrameData *frame) {
}
}
bool DrawEngineVulkan::IsCodePtrVertexDecoder(const u8 *ptr) const {
return decJitCache_->IsInSpace(ptr);
}
void DrawEngineVulkan::TessellationDataTransferVulkan::PrepareBuffers(float *&pos, float *&tex, float *&col, int size, bool hasColor, bool hasTexCoords) {
int rowPitch;

2
GPU/Vulkan/DrawEngineVulkan.h
View File

@ -147,8 +147,6 @@ public:
DoFlush();
}
bool IsCodePtrVertexDecoder(const u8 *ptr) const;
void DispatchFlush() override { Flush(); }
void DispatchSubmitPrim(void *verts, void *inds, GEPrimitiveType prim, int vertexCount, u32 vertType, int *bytesRead) override {
SubmitPrim(verts, inds, prim, vertexCount, vertType, bytesRead);

8
GPU/Vulkan/GPU_Vulkan.cpp
View File

@ -856,14 +856,6 @@ void GPU_Vulkan::DoState(PointerWrap &p) {
}
}
bool GPU_Vulkan::DescribeCodePtr(const u8 *ptr, std::string &name) {
if (drawEngine_.IsCodePtrVertexDecoder(ptr)) {
name = "VertexDecoderJit";
return true;
}
return false;
}
std::vector<std::string> GPU_Vulkan::DebugGetShaderIDs(DebugShaderType type) {
if (type == SHADER_TYPE_VERTEXLOADER) {
return drawEngine_.DebugGetVertexLoaderIDs();

1
GPU/Vulkan/GPU_Vulkan.h
View File

@ -84,7 +84,6 @@ public:
// Using string because it's generic - makes no assumptions on the size of the shader IDs of this backend.
std::vector<std::string> DebugGetShaderIDs(DebugShaderType shader) override;
std::string DebugGetShaderString(std::string id, DebugShaderType shader, DebugShaderStringType stringType) override;
bool DescribeCodePtr(const u8 *ptr, std::string &name) override;
protected:
void FastRunLoop(DisplayList &list) override;