Merge pull request #17 from SonicMastr/main

Bump max supported texture units to 16
GrapheneCt · Apr 15, 2022 · 19c384c · 19c384c
2 parents 9670a22 + a10bdb8
commit 19c384c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/eurasiacon/opengles2/constants.h b/eurasiacon/opengles2/constants.h
@@ -49,18 +49,10 @@
 
 #define GLES2_MIN_TEXTURE_LEVEL				0
 
-#if defined(GLES2_TEST_LIMITS)
 #define GLES2_MAX_TEXTURE_UNITS				16
 #define GLES2_MAX_VERTEX_TEXTURE_UNITS		16
 #define GLES2_MAX_VERTEX_UNIFORM_VECTORS	512
 #define GLES2_MAX_FRAGMENT_UNIFORM_VECTORS	64
-#else
-#define GLES2_MAX_TEXTURE_UNITS				8
-#define GLES2_MAX_VERTEX_TEXTURE_UNITS		8
-#define GLES2_MAX_VERTEX_UNIFORM_VECTORS	128
-#define GLES2_MAX_FRAGMENT_UNIFORM_VECTORS	64
-#endif
-
 
 #define GLES2_MAX_VERTICES					65536
 #define GLES2_MAX_INDICES					65536

diff --git a/gpu_es4_ext/eurasia/services4/srvclient/bridged/bridged_pvr_dc_glue.c b/gpu_es4_ext/eurasia/services4/srvclient/bridged/bridged_pvr_dc_glue.c
@@ -432,6 +432,7 @@ PVRSRV_ERROR IMG_CALLCONV PVRSRVCreateDCSwapChain(IMG_HANDLE	hDevice,
 
 	psSwapChain->psConnection = psConnection;
 	psSwapChain->hSwapChainReadyEvf = readyEvfId;
+	psSwapChain->hSwapChainPendingEvf = pendingEvfId;
 	psSwapChain->hSwapChainThread = thrdId;
 	psSwapChain->sDims.ui32Width = psSrcSurfAttrib->sDims.ui32Width;
 	psSwapChain->sDims.ui32Height = psSrcSurfAttrib->sDims.ui32Height;
@@ -512,10 +513,6 @@ IMG_HANDLE hSwapChain)
 
 	psSwapChain = (PSP2_SWAPCHAIN *)hSwapChain;
 
-	for (i = 0; i < psSwapChain->ui32BufferCount; i++) {
-		sceKernelFreeMemBlock(psSwapChain->hDispMemUID[i]);
-	}
-
 	s_psOldBufSyncInfo = IMG_NULL;
 
 	s_flipChainExists = IMG_FALSE;
@@ -530,6 +527,10 @@ IMG_HANDLE hSwapChain)
 		PVRSRVDestroySyncInfoModObj((PVRSRV_CONNECTION *)hDevice, s_hKernelSwapChainSync[i]);
 	}
 
+	for (i = 0; i < psSwapChain->ui32BufferCount; i++) {
+		sceKernelFreeMemBlock(psSwapChain->hDispMemUID[i]);
+	}
+
 	PVRSRVFreeUserModeMem(psSwapChain);
 
 	return PVRSRV_OK;