ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PGXP: Don't abort() on vertex cache alloc fail

This commit is contained in:
Connor McLaughlin 2021-06-12 20:44:09 +10:00
parent 22b2963bfe
commit a47686a313
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/core/pgxp.cpp
View File

@ -20,10 +20,12 @@
#include "pgxp.h" #include "pgxp.h"
#include "bus.h" #include "bus.h"
#include "common/log.h"
#include "cpu_core.h" #include "cpu_core.h"
#include "settings.h" #include "settings.h"
#include <climits> #include <climits>
#include <cmath> #include <cmath>
Log_SetChannel(PGXP);
namespace PGXP { namespace PGXP {
// pgxp_types.h // pgxp_types.h
@ -356,6 +358,9 @@ void Initialize()
PGXP_InitMem(); PGXP_InitMem();
PGXP_InitCPU(); PGXP_InitCPU();
PGXP_InitGTE(); PGXP_InitGTE();
if (vertexCache)
std::memset(vertexCache, 0, sizeof(PGXP_value) * VERTEX_CACHE_SIZE);
} }
void Shutdown() void Shutdown()
@ -576,21 +581,20 @@ unsigned int IsSessionID(unsigned int vertID)
return 0; return 0;
} }
static void InitPGXPVertexCache() static bool InitPGXPVertexCache()
{
if (!vertexCache)
{ {
if (vertexCache)
std::free(vertexCache);
vertexCache = static_cast<PGXP_value*>(std::calloc(VERTEX_CACHE_SIZE, sizeof(PGXP_value))); vertexCache = static_cast<PGXP_value*>(std::calloc(VERTEX_CACHE_SIZE, sizeof(PGXP_value)));
if (!vertexCache) if (!vertexCache)
{ {
std::fprintf(stderr, "Failed to allocate PGXP vertex cache memory\n"); Log_ErrorPrint("Failed to allocate memory for vertex cache, disabling.");
std::abort(); g_settings.gpu_pgxp_vertex_cache = false;
} return false;
}
else
{
memset(vertexCache, 0x00, VERTEX_CACHE_SIZE * sizeof(PGXP_value));
} }
return true;
} }
void PGXP_CacheVertex(short sx, short sy, const PGXP_value* _pVertex) void PGXP_CacheVertex(short sx, short sy, const PGXP_value* _pVertex)
@ -605,8 +609,8 @@ void PGXP_CacheVertex(short sx, short sy, const PGXP_value* _pVertex)
} }
// Initialise cache on first use // Initialise cache on first use
if (!vertexCache) if (!vertexCache && !InitPGXPVertexCache())
InitPGXPVertexCache(); return;
// if (bGteAccuracy) // if (bGteAccuracy)
{ {
@ -650,15 +654,15 @@ PGXP_value* PGXP_GetCachedVertex(short sx, short sy)
if (cacheMode != mode_read) if (cacheMode != mode_read)
{ {
if (cacheMode == mode_fail) if (cacheMode == mode_fail)
return NULL; return nullptr;
// First vertex of read session (frame?) // First vertex of read session (frame?)
cacheMode = mode_read; cacheMode = mode_read;
} }
// Initialise cache on first use // Initialise cache on first use
if (!vertexCache) if (!vertexCache && !InitPGXPVertexCache())
InitPGXPVertexCache(); return nullptr;
if (sx >= -0x800 && sx <= 0x7ff && sy >= -0x800 && sy <= 0x7ff) if (sx >= -0x800 && sx <= 0x7ff && sy >= -0x800 && sy <= 0x7ff)
{ {
@ -667,7 +671,7 @@ PGXP_value* PGXP_GetCachedVertex(short sx, short sy)
} }
} }
return NULL; return nullptr;
} }
static ALWAYS_INLINE_RELEASE float TruncateVertexPosition(float p) static ALWAYS_INLINE_RELEASE float TruncateVertexPosition(float p)