From 941af011bd4e0f7a462a98b7891930ce5767f342 Mon Sep 17 00:00:00 2001 From: Jaylon Gowie Date: Tue, 29 Mar 2022 20:29:41 -0500 Subject: [PATCH 1/6] Bump max supported texture units to 16 --- eurasiacon/opengles1/constants.h | 2 +- eurasiacon/opengles2/opengles2.vcxproj | 4 ++-- gpu_es4_ext/libSceGpuEs4UserForVsh_stub.a | Bin 3920 -> 3920 bytes gpu_es4_ext/libSceGpuEs4User_stub.a | Bin 67414 -> 67414 bytes 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eurasiacon/opengles1/constants.h b/eurasiacon/opengles1/constants.h index 7cf0025..f846fee 100644 --- a/eurasiacon/opengles1/constants.h +++ b/eurasiacon/opengles1/constants.h @@ -52,7 +52,7 @@ #define GLES1_MAX_TEXTURE_STACK_DEPTH 4 #define GLES1_MAX_PROGRAM_STACK_DEPTH 2 -#define GLES1_MAX_TEXTURE_UNITS 4 +#define GLES1_MAX_TEXTURE_UNITS 16 #if(EURASIA_TEXTURESIZE_MAX > 2048) #define GLES1_MAX_TEXTURE_SIZE 4096UL diff --git a/eurasiacon/opengles2/opengles2.vcxproj b/eurasiacon/opengles2/opengles2.vcxproj index 3423d5b..29c636a 100644 --- a/eurasiacon/opengles2/opengles2.vcxproj +++ b/eurasiacon/opengles2/opengles2.vcxproj @@ -212,7 +212,7 @@ - NDEBUG;GLSL_ES;GEN_HW_CODE;INCLUDE_SGX_FEATURE_TABLE;INCLUDE_SGX_BUG_TABLE;OUTPUT_USPBIN;OGLES_PSP2_PRX_EXPORT;USER;PDS_BUILD_OPENGLES;USE_GCC__thread_KEYWORD;OGLES2_MODULE;SUPPORT_SGX;SUPPORT_SGX543;SUPPORT_OPENGLES2;API_MODULES_RUNTIME_CHECKED;OPTIMISE_NON_NPTL_SINGLE_THREAD_TLS_LOOKUP;SUPPORT_BINARY_SHADER;SUPPORT_SOURCE_SHADER;EGL_EXTENSION_ANDROID_BLOB_CACHE;GLES2_EXTENSION_GET_PROGRAM_BINARY;GLES2_EXTENSION_EGL_IMAGE_EXTERNAL;%(PreprocessorDefinitions) + NDEBUG;GLSL_ES;GEN_HW_CODE;INCLUDE_SGX_FEATURE_TABLE;INCLUDE_SGX_BUG_TABLE;OUTPUT_USPBIN;OGLES_PSP2_PRX_EXPORT;USER;PDS_BUILD_OPENGLES;USE_GCC__thread_KEYWORD;OGLES2_MODULE;SUPPORT_SGX;SUPPORT_SGX543;SUPPORT_OPENGLES2;API_MODULES_RUNTIME_CHECKED;OPTIMISE_NON_NPTL_SINGLE_THREAD_TLS_LOOKUP;SUPPORT_BINARY_SHADER;SUPPORT_SOURCE_SHADER;EGL_EXTENSION_ANDROID_BLOB_CACHE;GLES2_EXTENSION_GET_PROGRAM_BINARY;GLES2_EXTENSION_EGL_IMAGE_EXTERNAL;GLES2_TEST_LIMITS;%(PreprocessorDefinitions) Level3 NotUsing $(SCE_PSP2_SDK_DIR)\target\include\vdsuite\user;$(SCE_PSP2_SDK_DIR)\target\include\vdsuite\common;$(SolutionDir)include\gpu_es4;$(SolutionDir)include\gpu_es4\eurasia\include4;$(SolutionDir)include\gpu_es4\eurasia\hwdefs;$(SolutionDir)include\gpu_es4\eurasia\services4\include;$(SolutionDir)include\gpu_es4\eurasia\services4\system\psp2;$(SolutionDir)codegen\pds;$(SolutionDir)codegen\pixevent;$(SolutionDir)codegen\usegen;$(SolutionDir)eurasiacon\include;$(SolutionDir)eurasiacon\common;$(SolutionDir)common\tls;$(SolutionDir)common\dmscalc;$(SolutionDir)include\gpu_es4\eurasia\services4\srvclient\devices\sgx;$(SolutionDir)codegen\ffgen;$(SolutionDir)tools\intern\useasm;$(SolutionDir)codegen\pixfmts;$(SolutionDir)intermediates\pds_mte_state_copy;$(SolutionDir)intermediates\pds_aux_vtx;$(SolutionDir)intermediates\pixelevent;$(SolutionDir)intermediates\pixelevent_tilexy;$(SolutionDir)intermediates\sgxsupport;$(SolutionDir)intermediates\errata;$(SolutionDir)tools\intern\usp;$(SolutionDir)tools\intern\oglcompiler\binshader;$(SolutionDir)tools\intern\oglcompiler\glsl;$(SolutionDir)tools\intern\oglcompiler\powervr;$(SolutionDir)tools\intern\oglcompiler\parser;$(SolutionDir)tools\intern\usc2;$(SolutionDir)codegen\combiner;$(SolutionDir)intermediates\glslparser;%(AdditionalIncludeDirectories) @@ -230,7 +230,7 @@ - _DEBUG;DEBUG;GLSL_ES;GEN_HW_CODE;INCLUDE_SGX_FEATURE_TABLE;INCLUDE_SGX_BUG_TABLE;OUTPUT_USPBIN;OGLES_PSP2_PRX_EXPORT;USER;PDS_BUILD_OPENGLES;USE_GCC__thread_KEYWORD;OGLES2_MODULE;SUPPORT_SGX;SUPPORT_SGX543;SUPPORT_OPENGLES2;API_MODULES_RUNTIME_CHECKED;OPTIMISE_NON_NPTL_SINGLE_THREAD_TLS_LOOKUP;SUPPORT_BINARY_SHADER;SUPPORT_SOURCE_SHADER;EGL_EXTENSION_ANDROID_BLOB_CACHE;GLES2_EXTENSION_GET_PROGRAM_BINARY;GLES2_EXTENSION_EGL_IMAGE_EXTERNAL;DUMP_LOGFILES;%(PreprocessorDefinitions) + _DEBUG;DEBUG;GLSL_ES;GEN_HW_CODE;INCLUDE_SGX_FEATURE_TABLE;INCLUDE_SGX_BUG_TABLE;OUTPUT_USPBIN;OGLES_PSP2_PRX_EXPORT;USER;PDS_BUILD_OPENGLES;USE_GCC__thread_KEYWORD;OGLES2_MODULE;SUPPORT_SGX;SUPPORT_SGX543;SUPPORT_OPENGLES2;API_MODULES_RUNTIME_CHECKED;OPTIMISE_NON_NPTL_SINGLE_THREAD_TLS_LOOKUP;SUPPORT_BINARY_SHADER;SUPPORT_SOURCE_SHADER;EGL_EXTENSION_ANDROID_BLOB_CACHE;GLES2_EXTENSION_GET_PROGRAM_BINARY;GLES2_EXTENSION_EGL_IMAGE_EXTERNAL;DUMP_LOGFILES;GLES2_TEST_LIMITS;%(PreprocessorDefinitions) true NotUsing $(SCE_PSP2_SDK_DIR)\target\include\vdsuite\user;$(SCE_PSP2_SDK_DIR)\target\include\vdsuite\common;$(SolutionDir)include\gpu_es4;$(SolutionDir)include\gpu_es4\eurasia\include4;$(SolutionDir)include\gpu_es4\eurasia\hwdefs;$(SolutionDir)include\gpu_es4\eurasia\services4\include;$(SolutionDir)include\gpu_es4\eurasia\services4\system\psp2;$(SolutionDir)codegen\pds;$(SolutionDir)codegen\pixevent;$(SolutionDir)codegen\usegen;$(SolutionDir)eurasiacon\include;$(SolutionDir)eurasiacon\common;$(SolutionDir)common\tls;$(SolutionDir)common\dmscalc;$(SolutionDir)include\gpu_es4\eurasia\services4\srvclient\devices\sgx;$(SolutionDir)codegen\ffgen;$(SolutionDir)tools\intern\useasm;$(SolutionDir)codegen\pixfmts;$(SolutionDir)intermediates\pds_mte_state_copy;$(SolutionDir)intermediates\pds_aux_vtx;$(SolutionDir)intermediates\pixelevent;$(SolutionDir)intermediates\pixelevent_tilexy;$(SolutionDir)intermediates\sgxsupport;$(SolutionDir)intermediates\errata;$(SolutionDir)tools\intern\usp;$(SolutionDir)tools\intern\oglcompiler\binshader;$(SolutionDir)tools\intern\oglcompiler\glsl;$(SolutionDir)tools\intern\oglcompiler\powervr;$(SolutionDir)tools\intern\oglcompiler\parser;$(SolutionDir)tools\intern\usc2;$(SolutionDir)codegen\combiner;$(SolutionDir)intermediates\glslparser;%(AdditionalIncludeDirectories) diff --git a/gpu_es4_ext/libSceGpuEs4UserForVsh_stub.a b/gpu_es4_ext/libSceGpuEs4UserForVsh_stub.a index f834abbf25164e2154671a899d22a5cd3528943f..0095b03a9b72d5a92dbfe79caade56433934900a 100644 GIT binary patch delta 64 zcmca0cR_A~G`oeVv4NqX!A7O0j4<|QKBlWIFwSH?Cb3QImzj|G;+sEm#rS%dp_T&vZ;+x+~%ws_k5Zk;;b}}bIptEoDCH3oY z6`MEcvaN-)fs%cjg`6M5RZp^&oV<2Q z>E@2$$;oqlOE;&LyhaFa(COR!tP)AphEB=Jxz|cJN7Y|Or~-M}w*}$l%^NyX;Z6bj zc~w8cYM`Gtubq;CPyjS@v*|1sxWMLy`4izBu=Zt35!yFTSXBs@1^IK@1|)xO(2?A{ zbZY=y!DN_&yLKZS4AS-K0J1KqugZ=g6m1STjS_K^o8MkQiW88dbFXkcBR z03%6q^3tuPo3}l@jR-1G%x!pv@Bk>X!NI=m4IvaN-)fs%cjg`6M5RZp^&oV<2Q z>E@2$$;oqlOE;&LyhaFa(COR!tP)AphEB=Jxz|cJN7Y|Or~-M}w*}$l%^NyX;Z6bj zc~w8cYM`Gtubq;CPyjS@v*|1sxWMLy`4izBu=Zt35!yFTSXBs@1^IK@1|)xO(2?A{ zbZY=y!DN_&yLKZS4AS-K0J1KqugZ=g6m1STjS_K^o8MkQiW88dbFXkcBR z03%6q^3tuPo3}l@jR-1G%x!pv@Bk>X!NI=m4I Date: Tue, 29 Mar 2022 20:56:28 -0500 Subject: [PATCH 2/6] Update constants.h --- eurasiacon/opengles1/constants.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eurasiacon/opengles1/constants.h b/eurasiacon/opengles1/constants.h index f846fee..8630a15 100644 --- a/eurasiacon/opengles1/constants.h +++ b/eurasiacon/opengles1/constants.h @@ -52,7 +52,7 @@ #define GLES1_MAX_TEXTURE_STACK_DEPTH 4 #define GLES1_MAX_PROGRAM_STACK_DEPTH 2 -#define GLES1_MAX_TEXTURE_UNITS 16 +#define GLES1_MAX_TEXTURE_UNITS 8 #if(EURASIA_TEXTURESIZE_MAX > 2048) #define GLES1_MAX_TEXTURE_SIZE 4096UL From d1161a4287890cafce0f424b4b02381f062940bf Mon Sep 17 00:00:00 2001 From: Jaylon Gowie Date: Tue, 29 Mar 2022 21:02:26 -0500 Subject: [PATCH 3/6] Revert "Update constants.h" This reverts commit d77877d8425fdafe3dc4512ac05f4646e0e9ef13. --- eurasiacon/opengles1/constants.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eurasiacon/opengles1/constants.h b/eurasiacon/opengles1/constants.h index 8630a15..f846fee 100644 --- a/eurasiacon/opengles1/constants.h +++ b/eurasiacon/opengles1/constants.h @@ -52,7 +52,7 @@ #define GLES1_MAX_TEXTURE_STACK_DEPTH 4 #define GLES1_MAX_PROGRAM_STACK_DEPTH 2 -#define GLES1_MAX_TEXTURE_UNITS 8 +#define GLES1_MAX_TEXTURE_UNITS 16 #if(EURASIA_TEXTURESIZE_MAX > 2048) #define GLES1_MAX_TEXTURE_SIZE 4096UL From cbf1c6a398047f105d0c67effa83f24c9945d0aa Mon Sep 17 00:00:00 2001 From: Jaylon Gowie Date: Mon, 4 Apr 2022 19:56:28 -0500 Subject: [PATCH 4/6] GLES1_MAX_TEXTURE_UNITS back to 4 --- eurasiacon/opengles1/constants.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eurasiacon/opengles1/constants.h b/eurasiacon/opengles1/constants.h index f846fee..7cf0025 100644 --- a/eurasiacon/opengles1/constants.h +++ b/eurasiacon/opengles1/constants.h @@ -52,7 +52,7 @@ #define GLES1_MAX_TEXTURE_STACK_DEPTH 4 #define GLES1_MAX_PROGRAM_STACK_DEPTH 2 -#define GLES1_MAX_TEXTURE_UNITS 16 +#define GLES1_MAX_TEXTURE_UNITS 4 #if(EURASIA_TEXTURESIZE_MAX > 2048) #define GLES1_MAX_TEXTURE_SIZE 4096UL From 9cd8a6ba646c6b5d0bfeecacaddb31b5b0cc42aa Mon Sep 17 00:00:00 2001 From: Jaylon Gowie Date: Mon, 4 Apr 2022 19:59:27 -0500 Subject: [PATCH 5/6] Hardcode GLES2_TEST_LIMITS --- eurasiacon/opengles2/constants.h | 8 -------- eurasiacon/opengles2/opengles2.vcxproj | 4 ++-- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/eurasiacon/opengles2/constants.h b/eurasiacon/opengles2/constants.h index 5c47dfb..94c6afc 100644 --- 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/eurasiacon/opengles2/opengles2.vcxproj b/eurasiacon/opengles2/opengles2.vcxproj index 29c636a..3423d5b 100644 --- a/eurasiacon/opengles2/opengles2.vcxproj +++ b/eurasiacon/opengles2/opengles2.vcxproj @@ -212,7 +212,7 @@ - NDEBUG;GLSL_ES;GEN_HW_CODE;INCLUDE_SGX_FEATURE_TABLE;INCLUDE_SGX_BUG_TABLE;OUTPUT_USPBIN;OGLES_PSP2_PRX_EXPORT;USER;PDS_BUILD_OPENGLES;USE_GCC__thread_KEYWORD;OGLES2_MODULE;SUPPORT_SGX;SUPPORT_SGX543;SUPPORT_OPENGLES2;API_MODULES_RUNTIME_CHECKED;OPTIMISE_NON_NPTL_SINGLE_THREAD_TLS_LOOKUP;SUPPORT_BINARY_SHADER;SUPPORT_SOURCE_SHADER;EGL_EXTENSION_ANDROID_BLOB_CACHE;GLES2_EXTENSION_GET_PROGRAM_BINARY;GLES2_EXTENSION_EGL_IMAGE_EXTERNAL;GLES2_TEST_LIMITS;%(PreprocessorDefinitions) + NDEBUG;GLSL_ES;GEN_HW_CODE;INCLUDE_SGX_FEATURE_TABLE;INCLUDE_SGX_BUG_TABLE;OUTPUT_USPBIN;OGLES_PSP2_PRX_EXPORT;USER;PDS_BUILD_OPENGLES;USE_GCC__thread_KEYWORD;OGLES2_MODULE;SUPPORT_SGX;SUPPORT_SGX543;SUPPORT_OPENGLES2;API_MODULES_RUNTIME_CHECKED;OPTIMISE_NON_NPTL_SINGLE_THREAD_TLS_LOOKUP;SUPPORT_BINARY_SHADER;SUPPORT_SOURCE_SHADER;EGL_EXTENSION_ANDROID_BLOB_CACHE;GLES2_EXTENSION_GET_PROGRAM_BINARY;GLES2_EXTENSION_EGL_IMAGE_EXTERNAL;%(PreprocessorDefinitions) Level3 NotUsing $(SCE_PSP2_SDK_DIR)\target\include\vdsuite\user;$(SCE_PSP2_SDK_DIR)\target\include\vdsuite\common;$(SolutionDir)include\gpu_es4;$(SolutionDir)include\gpu_es4\eurasia\include4;$(SolutionDir)include\gpu_es4\eurasia\hwdefs;$(SolutionDir)include\gpu_es4\eurasia\services4\include;$(SolutionDir)include\gpu_es4\eurasia\services4\system\psp2;$(SolutionDir)codegen\pds;$(SolutionDir)codegen\pixevent;$(SolutionDir)codegen\usegen;$(SolutionDir)eurasiacon\include;$(SolutionDir)eurasiacon\common;$(SolutionDir)common\tls;$(SolutionDir)common\dmscalc;$(SolutionDir)include\gpu_es4\eurasia\services4\srvclient\devices\sgx;$(SolutionDir)codegen\ffgen;$(SolutionDir)tools\intern\useasm;$(SolutionDir)codegen\pixfmts;$(SolutionDir)intermediates\pds_mte_state_copy;$(SolutionDir)intermediates\pds_aux_vtx;$(SolutionDir)intermediates\pixelevent;$(SolutionDir)intermediates\pixelevent_tilexy;$(SolutionDir)intermediates\sgxsupport;$(SolutionDir)intermediates\errata;$(SolutionDir)tools\intern\usp;$(SolutionDir)tools\intern\oglcompiler\binshader;$(SolutionDir)tools\intern\oglcompiler\glsl;$(SolutionDir)tools\intern\oglcompiler\powervr;$(SolutionDir)tools\intern\oglcompiler\parser;$(SolutionDir)tools\intern\usc2;$(SolutionDir)codegen\combiner;$(SolutionDir)intermediates\glslparser;%(AdditionalIncludeDirectories) @@ -230,7 +230,7 @@ - _DEBUG;DEBUG;GLSL_ES;GEN_HW_CODE;INCLUDE_SGX_FEATURE_TABLE;INCLUDE_SGX_BUG_TABLE;OUTPUT_USPBIN;OGLES_PSP2_PRX_EXPORT;USER;PDS_BUILD_OPENGLES;USE_GCC__thread_KEYWORD;OGLES2_MODULE;SUPPORT_SGX;SUPPORT_SGX543;SUPPORT_OPENGLES2;API_MODULES_RUNTIME_CHECKED;OPTIMISE_NON_NPTL_SINGLE_THREAD_TLS_LOOKUP;SUPPORT_BINARY_SHADER;SUPPORT_SOURCE_SHADER;EGL_EXTENSION_ANDROID_BLOB_CACHE;GLES2_EXTENSION_GET_PROGRAM_BINARY;GLES2_EXTENSION_EGL_IMAGE_EXTERNAL;DUMP_LOGFILES;GLES2_TEST_LIMITS;%(PreprocessorDefinitions) + _DEBUG;DEBUG;GLSL_ES;GEN_HW_CODE;INCLUDE_SGX_FEATURE_TABLE;INCLUDE_SGX_BUG_TABLE;OUTPUT_USPBIN;OGLES_PSP2_PRX_EXPORT;USER;PDS_BUILD_OPENGLES;USE_GCC__thread_KEYWORD;OGLES2_MODULE;SUPPORT_SGX;SUPPORT_SGX543;SUPPORT_OPENGLES2;API_MODULES_RUNTIME_CHECKED;OPTIMISE_NON_NPTL_SINGLE_THREAD_TLS_LOOKUP;SUPPORT_BINARY_SHADER;SUPPORT_SOURCE_SHADER;EGL_EXTENSION_ANDROID_BLOB_CACHE;GLES2_EXTENSION_GET_PROGRAM_BINARY;GLES2_EXTENSION_EGL_IMAGE_EXTERNAL;DUMP_LOGFILES;%(PreprocessorDefinitions) true NotUsing $(SCE_PSP2_SDK_DIR)\target\include\vdsuite\user;$(SCE_PSP2_SDK_DIR)\target\include\vdsuite\common;$(SolutionDir)include\gpu_es4;$(SolutionDir)include\gpu_es4\eurasia\include4;$(SolutionDir)include\gpu_es4\eurasia\hwdefs;$(SolutionDir)include\gpu_es4\eurasia\services4\include;$(SolutionDir)include\gpu_es4\eurasia\services4\system\psp2;$(SolutionDir)codegen\pds;$(SolutionDir)codegen\pixevent;$(SolutionDir)codegen\usegen;$(SolutionDir)eurasiacon\include;$(SolutionDir)eurasiacon\common;$(SolutionDir)common\tls;$(SolutionDir)common\dmscalc;$(SolutionDir)include\gpu_es4\eurasia\services4\srvclient\devices\sgx;$(SolutionDir)codegen\ffgen;$(SolutionDir)tools\intern\useasm;$(SolutionDir)codegen\pixfmts;$(SolutionDir)intermediates\pds_mte_state_copy;$(SolutionDir)intermediates\pds_aux_vtx;$(SolutionDir)intermediates\pixelevent;$(SolutionDir)intermediates\pixelevent_tilexy;$(SolutionDir)intermediates\sgxsupport;$(SolutionDir)intermediates\errata;$(SolutionDir)tools\intern\usp;$(SolutionDir)tools\intern\oglcompiler\binshader;$(SolutionDir)tools\intern\oglcompiler\glsl;$(SolutionDir)tools\intern\oglcompiler\powervr;$(SolutionDir)tools\intern\oglcompiler\parser;$(SolutionDir)tools\intern\usc2;$(SolutionDir)codegen\combiner;$(SolutionDir)intermediates\glslparser;%(AdditionalIncludeDirectories) From a10bdb87edfedad7421ea32ffc921df77ab67f5e Mon Sep 17 00:00:00 2001 From: Jaylon Gowie Date: Thu, 14 Apr 2022 23:58:59 -0500 Subject: [PATCH 6/6] Fix syscall errors on termination --- .../srvclient/bridged/bridged_pvr_dc_glue.c | 9 +++++---- gpu_es4_ext/libSceGpuEs4UserForVsh_stub.a | Bin 3920 -> 3920 bytes gpu_es4_ext/libSceGpuEs4User_stub.a | Bin 67414 -> 67414 bytes 3 files changed, 5 insertions(+), 4 deletions(-) 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 index 2a8f0d6..831f1ef 100644 --- 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; diff --git a/gpu_es4_ext/libSceGpuEs4UserForVsh_stub.a b/gpu_es4_ext/libSceGpuEs4UserForVsh_stub.a index 0095b03a9b72d5a92dbfe79caade56433934900a..9623d3cc39d549dd997392f6744e844bd9a2bb13 100644 GIT binary patch delta 60 xcmca0cR_A~G@GTRrG=@*M#X20Q08V{rfV!v_GDfr@lEWPnGjrw%^x}ASpfu45Jvz2 delta 60 xcmca0cR_A~G@FH~v4NrCM#X20Q08V{rfV!v_GDfr@lEWPnGjrw%^x}ASpoG$56=Jq diff --git a/gpu_es4_ext/libSceGpuEs4User_stub.a b/gpu_es4_ext/libSceGpuEs4User_stub.a index da640b11bf9332d12f1db38710551b2c461fedbc..6f4cabc99b294cedea6721d88c6f157880b465cc 100644 GIT binary patch delta 716 zcmccC$8xQYWr8%DrKP2Xsl`Uc4H8i1!V?pr6H?NYN%n9dr_HVwVejO&i zdA&{^D_l-TaqPflui;|rb^13yt3;?--zhaY_gd-ZsQSxrH6VBTwjlhuzB3K(29Q5j z^&{*A`g8NzDH(8ipn023XSu-mo9pLKg0aD2v}`F{@8e;PTCq&C03fCzt(TXU~@AlcEs+3OBGJpj{> z)a0dGOE+(OcpDxzpg7s^tPrjT7*^mg-u4C&#vpf@eL}bk6lS}=!~G33S90^7Kc+}# M^lxutV!Xft0LJA7pa1{> delta 716 zcmccC$8xQYWr8%Dg{iTDq2Wfw4H8i1!V?pr6H?NYN%n9dr_HVwVejO&i zdA&{^D_l-TaqPflui;|rb^13yt3;?--zhaY_gd-ZsQSxrH6VBTwjlhuzB3K(29Q5j z^&{*A`g8NzDH(8ipn023XSu-mo9pLKg0aD2v}`F{@8e;PTCq&C03fCzt(TXU~@AlcEs+3OBGJpj{> z)a0dGOE+(OcpDxzpg7s^tPrjT7*^mg-u4C&#vpf@eL}bk6lS}=!~G33S90^7Kc+}# M^lxutV!Xft0CYY8cmMzZ