Added PSP2-specific TA kick props to apphint

GrapheneCt · Aug 28, 2021 · ed9d00c · ed9d00c
1 parent 7528e0f
commit ed9d00c
Show file tree

Hide file tree

Showing 11 changed files with 39 additions and 5 deletions.
diff --git a/eurasiacon/opengles1/misc.c b/eurasiacon/opengles1/misc.c
@@ -854,7 +854,7 @@ IMG_INTERNAL IMG_BOOL GetApplicationHints(GLESAppHints *psAppHints, EGLcontextMo
 	ui32Default = 0;
 	PVRSRVGetAppHint(pvHintState, "SwTexOpThreadAffinity", IMG_UINT_TYPE, &ui32Default, &psAppHints->ui32SwTexOpThreadAffinity);
 
-	ui32Default = 16;
+	ui32Default = 256;
 	PVRSRVGetAppHint(pvHintState, "SwTexOpMaxUltNum", IMG_UINT_TYPE, &ui32Default, &psAppHints->ui32SwTexOpMaxUltNum);
 
 	ui32Default = 10000000;
@@ -863,6 +863,12 @@ IMG_INTERNAL IMG_BOOL GetApplicationHints(GLESAppHints *psAppHints, EGLcontextMo
 	ui32Default = 1;
 	PVRSRVGetAppHint(pvHintState, "DisableAsyncTextureOp", IMG_UINT_TYPE, &ui32Default, &psAppHints->bDisableAsyncTextureOp);
 
+	ui32Default = 1000;
+	PVRSRVGetAppHint(pvHintState, "PrimitiveSplitThreshold", IMG_UINT_TYPE, &ui32Default, &psAppHints->ui32PrimitiveSplitThreshold);
+
+	ui32Default = 0;
+	PVRSRVGetAppHint(pvHintState, "MaxDrawCallsPerCore", IMG_UINT_TYPE, &ui32Default, &psAppHints->ui32MaxDrawCallsPerCore);
+
 	PVRSRVFreeAppHintState(IMG_OPENGLES1, pvHintState);
 
 	return IMG_TRUE;

diff --git a/eurasiacon/opengles1/misc.h b/eurasiacon/opengles1/misc.h
@@ -97,6 +97,8 @@ typedef struct GLESAppHintsRec
 	IMG_UINT32 ui32SwTexOpMaxUltNum;
 	IMG_UINT32 ui32SwTexOpCleanupDelay;
 	IMG_BOOL bDisableAsyncTextureOp;
+	IMG_UINT32 ui32PrimitiveSplitThreshold;
+	IMG_UINT32 ui32MaxDrawCallsPerCore;
 } GLESAppHints;
 
 IMG_BOOL GetApplicationHints(GLESAppHints *psAppHints, EGLcontextMode *psMode);

diff --git a/eurasiacon/opengles1/sgxif.c b/eurasiacon/opengles1/sgxif.c
@@ -1917,7 +1917,8 @@ static IMG_EGLERROR DoKickTA(GLES1Context *gc, EGLRenderSurface *psRenderSurface
 	psKickTA->sKickTACommon.ui32SceneHeight = psRenderSurface->ui32Height;
 	psKickTA->sKickTACommon.ui32ValidRegionXMax = psRenderSurface->ui32Width - 1;
 	psKickTA->sKickTACommon.ui32ValidRegionYMax = psRenderSurface->ui32Height - 1;
-	psKickTA->sKickTACommon.ui16PrimitiveSplitThreshold = 1000;
+	psKickTA->sKickTACommon.ui16MaxDrawCallsPerCore = gc->sAppHints.ui32MaxDrawCallsPerCore;
+	psKickTA->sKickTACommon.ui16PrimitiveSplitThreshold = gc->sAppHints.ui32PrimitiveSplitThreshold;
 
 	while (gc->ui32AsyncTexOpNum)
 	{

diff --git a/eurasiacon/opengles2/misc.c b/eurasiacon/opengles2/misc.c
@@ -723,7 +723,7 @@ IMG_INTERNAL IMG_BOOL GetApplicationHints(GLESAppHints *psAppHints, EGLcontextMo
 	ui32Default = 0;
 	PVRSRVGetAppHint(pvHintState, "SwTexOpThreadAffinity", IMG_UINT_TYPE, &ui32Default, &psAppHints->ui32SwTexOpThreadAffinity);
 
-	ui32Default = 16;
+	ui32Default = 256;
 	PVRSRVGetAppHint(pvHintState, "SwTexOpMaxUltNum", IMG_UINT_TYPE, &ui32Default, &psAppHints->ui32SwTexOpMaxUltNum);
 
 	ui32Default = 10000000;
@@ -732,6 +732,12 @@ IMG_INTERNAL IMG_BOOL GetApplicationHints(GLESAppHints *psAppHints, EGLcontextMo
 	ui32Default = 1;
 	PVRSRVGetAppHint(pvHintState, "DisableAsyncTextureOp", IMG_UINT_TYPE, &ui32Default, &psAppHints->bDisableAsyncTextureOp);
 
+	ui32Default = 1000;
+	PVRSRVGetAppHint(pvHintState, "PrimitiveSplitThreshold", IMG_UINT_TYPE, &ui32Default, &psAppHints->ui32PrimitiveSplitThreshold);
+
+	ui32Default = 0;
+	PVRSRVGetAppHint(pvHintState, "MaxDrawCallsPerCore", IMG_UINT_TYPE, &ui32Default, &psAppHints->ui32MaxDrawCallsPerCore);
+
 	PVRSRVFreeAppHintState(IMG_OPENGLES2, pvHintState);
 
 	return IMG_TRUE;

diff --git a/eurasiacon/opengles2/misc.h b/eurasiacon/opengles2/misc.h
@@ -149,6 +149,8 @@ typedef struct GLESAppHintsRec
 	IMG_UINT32 ui32SwTexOpMaxUltNum;
 	IMG_UINT32 ui32SwTexOpCleanupDelay;
 	IMG_BOOL bDisableAsyncTextureOp;
+	IMG_UINT32 ui32PrimitiveSplitThreshold;
+	IMG_UINT32 ui32MaxDrawCallsPerCore;
 } GLESAppHints;
 
 

diff --git a/eurasiacon/opengles2/sgxif.c b/eurasiacon/opengles2/sgxif.c
@@ -2036,7 +2036,8 @@ static IMG_EGLERROR DoKickTA(GLES2Context *gc, EGLRenderSurface *psRenderSurface
 	psKickTA->sKickTACommon.ui32SceneHeight = psRenderSurface->ui32Height;
 	psKickTA->sKickTACommon.ui32ValidRegionXMax = psRenderSurface->ui32Width - 1;
 	psKickTA->sKickTACommon.ui32ValidRegionYMax = psRenderSurface->ui32Height - 1;
-	psKickTA->sKickTACommon.ui16PrimitiveSplitThreshold = 1000;
+	psKickTA->sKickTACommon.ui16MaxDrawCallsPerCore = gc->sAppHints.ui32MaxDrawCallsPerCore;
+	psKickTA->sKickTACommon.ui16PrimitiveSplitThreshold = gc->sAppHints.ui32PrimitiveSplitThreshold;
 
 	while (gc->ui32AsyncTexOpNum)
 	{

diff --git a/gpu_es4_ext/eurasia/services4/srvclient/env/playstation/common/pvr_apphint.c b/gpu_es4_ext/eurasia/services4/srvclient/env/playstation/common/pvr_apphint.c
@@ -429,7 +429,17 @@ IMG_EXPORT IMG_BOOL PVRSRVGetAppHint(IMG_VOID		*pvHintState,
 		}
 		else if (!sceClibStrncasecmp(pszHintName, "DisableAsyncTextureOp", 22))
 		{
-		*(IMG_UINT32 *)pvReturn = s_appHint.bDisableAsyncTextureOp;
+			*(IMG_UINT32 *)pvReturn = s_appHint.bDisableAsyncTextureOp;
+			bFound = IMG_TRUE;
+		}
+		else if (!sceClibStrncasecmp(pszHintName, "MaxDrawCallsPerCore", 20))
+		{
+			*(IMG_UINT32 *)pvReturn = s_appHint.ui32MaxDrawCallsPerCore;
+			bFound = IMG_TRUE;
+		}
+		else if (!sceClibStrncasecmp(pszHintName, "PrimitiveSplitThreshold", 24))
+		{
+			*(IMG_UINT32 *)pvReturn = s_appHint.ui32PrimitiveSplitThreshold;
 			bFound = IMG_TRUE;
 		}
 	}
@@ -544,6 +554,8 @@ IMG_EXPORT IMG_BOOL PVRSRVInitializeAppHint(PVRSRV_PSP2_APPHINT *psAppHint)
 	psAppHint->ui32SwTexOpMaxUltNum = 256;
 	psAppHint->ui32SwTexOpCleanupDelay = 10000000;
 	psAppHint->bDisableAsyncTextureOp = IMG_FALSE;
+	psAppHint->ui32PrimitiveSplitThreshold = 1000;
+	psAppHint->ui32MaxDrawCallsPerCore = 0;
 
 	psAppHint->ui32AdjustShaderPrecision = 0;
 	psAppHint->bDumpCompilerLogFiles = 0;

diff --git a/gpu_es4_ext/libSceGpuEs4UserForVsh_stub.a b/gpu_es4_ext/libSceGpuEs4UserForVsh_stub.a
diff --git a/gpu_es4_ext/libSceGpuEs4User_stub.a b/gpu_es4_ext/libSceGpuEs4User_stub.a
diff --git a/include/gpu_es4/eurasia/include4/services.h b/include/gpu_es4/eurasia/include4/services.h
@@ -97,6 +97,8 @@ extern "C" {
 		IMG_UINT32 ui32SwTexOpThreadAffinity;
 		IMG_UINT32 ui32SwTexOpMaxUltNum;
 		IMG_UINT32 ui32SwTexOpCleanupDelay;
+		IMG_UINT32 ui32PrimitiveSplitThreshold;
+		IMG_UINT32 ui32MaxDrawCallsPerCore;
 
 		/* OGLES2 hints */
 

diff --git a/include/gpu_es4/psp2_pvr_hint.h b/include/gpu_es4/psp2_pvr_hint.h
@@ -59,6 +59,8 @@ typedef struct _PVRSRV_PSP2_APPHINT_
 	IMG_UINT32 ui32SwTexOpThreadAffinity;
 	IMG_UINT32 ui32SwTexOpMaxUltNum;
 	IMG_UINT32 ui32SwTexOpCleanupDelay;
+	IMG_UINT32 ui32PrimitiveSplitThreshold;
+	IMG_UINT32 ui32MaxDrawCallsPerCore;
 
 	/* OGLES2 hints */