Threaded emscripten support

.gitlab-ci.yml

@@ -149,46 +149,24 @@ libretro-build-libnx-aarch64:
 
 # iOS
 libretro-build-ios-arm64-gles3:
-  variables:
-    WITH_DYNAREC: ""
-    EGL: 0
-    GLES3: 1
-    HAVE_NEON: 0
-    HAVE_THR_AL: 1
-    LLE: 1
   extends:
     - .libretro-ios-arm64-make-default
     - .core-defs
 
 # tvOS
 libretro-build-tvos-arm64-gles3:
-  variables:
-    WITH_DYNAREC: ""
-    EGL: 0
-    GLES3: 1
-    HAVE_NEON: 0
-    HAVE_THR_AL: 1
-    LLE: 1
   extends:
     - .libretro-tvos-arm64-make-default
     - .core-defs
 
 # MacOS 64-bit
 libretro-build-osx-x64:
-  variables:
-    WITH_DYNAREC: ""
-    HAVE_THR_AL: 1
-    LLE: 1
   extends:
     - .libretro-osx-x64-make-default
     - .core-defs
 
 # MacOS ARM 64-bit
 libretro-build-osx-arm64:
-  variables:
-    WITH_DYNAREC: ""
-    HAVE_THR_AL: 1
-    LLE: 1
   extends:
     - .libretro-osx-arm64-make-default
     - .core-defs

GLideN64/.github/workflows/build.yml

@@ -9,7 +9,7 @@ jobs:
       matrix:
         image: ["GLideN64 (x64 Mupen64Plus-CLI)", "GLideN64 (x64 Mupen64Plus-Qt)"]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install Packages
         run: |
           # fix for "error processing package grub-efi-amd64-signed"
@@ -43,15 +43,15 @@ jobs:
           cp translations/release/*.qm build/linux-mupen64plus-qt/
       - name: Upload GLideN64 (x64 Mupen64Plus-CLI)
         if: ${{ matrix.image == 'GLideN64 (x64 Mupen64Plus-CLI)' }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: GLideN64-${{ env.GIT_REVISION }}-Linux-Mupen64Plus-CLI-x64
           path: |
             build/linux-mupen64plus-cli/*.so
             build/linux-mupen64plus-cli/GLideN64.custom.ini
       - name: Upload GLideN64 (x64 Mupen64Plus-Qt)
         if: ${{ matrix.image == 'GLideN64 (x64 Mupen64Plus-Qt)' }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: GLideN64-${{ env.GIT_REVISION }}-Linux-Mupen64Plus-Qt-x64
           path: |
@@ -70,8 +70,8 @@ jobs:
       QT_BUILD_x86: qt-5_15-x86-msvc2017-static
       QT_BUILD_x64: qt-5_15-x64-msvc2017-static
     steps:
-      - uses: actions/checkout@v3
-      - uses: microsoft/setup-msbuild@v1.1
+      - uses: actions/checkout@v4
+      - uses: microsoft/setup-msbuild@v2
       - uses: msys2/setup-msys2@v2
         with:
           update: true
@@ -162,7 +162,7 @@ jobs:
           cp translations/release/*.qm build/windows-mupen64plus-qt/
         shell: msys2 {0}
       - name: Upload GLideN64 (x64 Project64-Qt)
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: ${{ matrix.image == 'GLideN64 (x64 Project64-Qt)' }}
         with:
           name: GLideN64-${{ env.GIT_REVISION }}-Windows-Project64-Qt-x64
@@ -171,7 +171,7 @@ jobs:
             build\windows-project64-qt-x64\GLideN64.custom.ini
             build\windows-project64-qt-x64\*.qm
       - name: Upload GLideN64 (x86 Project64-Qt)
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: ${{ matrix.image == 'GLideN64 (x86 Project64-Qt)' }}
         with:
           name: GLideN64-${{ env.GIT_REVISION }}-Windows-Project64-Qt-x86
@@ -180,7 +180,7 @@ jobs:
             build\windows-project64-qt\GLideN64.custom.ini
             build\windows-project64-qt\*.qm
       - name: Upload GLideN64 (x64 Project64-WTL)
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: ${{ matrix.image == 'GLideN64 (x64 Project64-WTL)' }}
         with:
           name: GLideN64-${{ env.GIT_REVISION }}-Windows-Project64-WTL-x64
@@ -189,7 +189,7 @@ jobs:
             build\windows-project64-wtl-x64\GLideN64.custom.ini
             build\windows-project64-wtl-x64\translations\*.Lang
       - name: Upload GLideN64 (x86 Project64-WTL)
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: ${{ matrix.image == 'GLideN64 (x86 Project64-WTL)' }}
         with:
           name: GLideN64-${{ env.GIT_REVISION }}-Windows-Project64-WTL-x86
@@ -198,23 +198,23 @@ jobs:
             build\windows-project64-wtl\GLideN64.custom.ini
             build\windows-project64-wtl\translations\*.Lang
       - name: Upload GLideN64 (x64 Mupen64Plus-CLI)
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: ${{ matrix.image == 'GLideN64 (x64 Mupen64Plus-CLI)' }}
         with:
           name: GLideN64-${{ env.GIT_REVISION }}-Windows-Mupen64Plus-CLI-x64
           path: |
             build\windows-mupen64plus-cli-x64\*.dll
             build\windows-mupen64plus-cli-x64\GLideN64.custom.ini
       - name: Upload GLideN64 (x86 Mupen64Plus-CLI)
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: ${{ matrix.image == 'GLideN64 (x86 Mupen64Plus-CLI)' }}
         with:
           name: GLideN64-${{ env.GIT_REVISION }}-Windows-Mupen64Plus-CLI-x86
           path: |
             build\windows-mupen64plus-cli\*.dll
             build\windows-mupen64plus-cli\GLideN64.custom.ini
       - name: Upload GLideN64 (x64 Mupen64Plus-Qt)
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: ${{ matrix.image == 'GLideN64 (x64 Mupen64Plus-Qt)' }}
         with:
           name: GLideN64-${{ env.GIT_REVISION }}-Windows-Mupen64Plus-Qt-x64
@@ -227,9 +227,9 @@ jobs:
     needs: [Windows, Linux]
     if: github.ref == 'refs/heads/master'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Download Artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           path: artifacts
       # sadly we can't download the artifacts without extracting it
@@ -238,7 +238,7 @@ jobs:
         run: |
           cd artifacts
           for artifact in *
-          do 
+          do
             echo "-> Creating ${artifact}.zip"
             pushd "$artifact"
             zip -r "../${artifact}.zip" *

GLideN64/.gitignore

@@ -22,4 +22,5 @@ src/Revision.h
 /projects/cmake/mupen64plus-video-GLideN64_autogen/
 .vs
 /translations/wtl
+.DS_Store
 .vscode/ipch/*

GLideN64/.gitrepo

@@ -6,7 +6,7 @@
 [subrepo]
 	remote = git@github.com:libretro/GLideN64.git
 	branch = develop
-	commit = bce50d1953cd70218496bc0359d6152e0fa2e195
-	parent = 7838a7824892afc9bf0598788370e0bb27589876
+	commit = b33fa191b823600252213a50e6d1f1e2353dcccf
+	parent = 4249e39b2c200e5f0895385f76d99928785f2bea
 	method = rebase
 	cmdver = 0.4.6

GLideN64/ini/GLideN64.custom.ini

@@ -18,7 +18,7 @@ generalEmulation\enableLegacyBlending=0
 Good_Name=Bio F.R.E.A.K.S. (E)(U)
 frameBufferEmulation\copyToRDRAM=1
 
-[BioHazard%20II]
+[BIOHAZARD%20II]
 Good_Name=Biohazard 2 (J)
 frameBufferEmulation\copyFromRDRAM=1
 frameBufferEmulation\copyToRDRAM=0
@@ -181,6 +181,7 @@ frameBufferEmulation\copyDepthToRDRAM=0
 Good_Name=Mario Kart 64 (E)(J)(U)
 graphics2D\enableNativeResTexrects=1
 graphics2D\enableTexCoordBounds=1
+frameBufferEmulation\copyToRDRAM=2
 
 [MARIO%20STORY]
 Good_Name=Mario Story (J)

GLideN64/projects/msvc/GLideN64.sln

@@ -4,7 +4,9 @@ VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GLideN64", "GLideN64.vcxproj", "{37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}"
 	ProjectSection(ProjectDependencies) = postProject
+		{37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE} = {37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}
 		{7BF6F100-31DB-44AE-A2A5-5DDEED9A909C} = {7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}
+		{9E05B70F-A294-44A9-A151-B2CC95AA884E} = {9E05B70F-A294-44A9-A151-B2CC95AA884E}
 		{DA965BCF-2219-47AF-ACE7-EAF76D5D4756} = {DA965BCF-2219-47AF-ACE7-EAF76D5D4756}
 	EndProjectSection
 EndProject

GLideN64/projects/msvc/GLideN64.vcxproj

@@ -369,7 +369,6 @@ copy /Y "$(OutDir)$(TargetName).*" "$(Mupen64PluginsDir_x64)")</Command>
       <ExcludedFromBuild Condition="'$(Configuration)'=='Debug_qt' Or '$(Configuration)'=='Debug_wtl' Or '$(Configuration)'=='Release_qt' Or '$(Configuration)'=='Release_wtl'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\src\N64.cpp" />
-    <ClCompile Include="..\..\src\NoiseTexture.cpp" />
     <ClCompile Include="..\..\src\PaletteTexture.cpp" />
     <ClCompile Include="..\..\src\Performance.cpp" />
     <ClCompile Include="..\..\src\PostProcessor.cpp" />
@@ -392,9 +391,11 @@ copy /Y "$(OutDir)$(TargetName).*" "$(Mupen64PluginsDir_x64)")</Command>
     <ClCompile Include="..\..\src\uCodes\F3DBETA.cpp" />
     <ClCompile Include="..\..\src\uCodes\F3DDKR.cpp" />
     <ClCompile Include="..\..\src\uCodes\F3DEX.cpp" />
+    <ClCompile Include="..\..\src\uCodes\F3DEX095.cpp" />
     <ClCompile Include="..\..\src\uCodes\F3DEX2.cpp" />
     <ClCompile Include="..\..\src\uCodes\F3DEX2ACCLAIM.cpp" />
     <ClCompile Include="..\..\src\uCodes\F3DEX2CBFD.cpp" />
+    <ClCompile Include="..\..\src\uCodes\F3DEX3.cpp" />
     <ClCompile Include="..\..\src\uCodes\F3DZEX2.cpp" />
     <ClCompile Include="..\..\src\uCodes\F3DFLX2.cpp" />
     <ClCompile Include="..\..\src\uCodes\F3DGOLDEN.cpp" />
@@ -520,7 +521,6 @@ copy /Y "$(OutDir)$(TargetName).*" "$(Mupen64PluginsDir_x64)")</Command>
       <ExcludedFromBuild Condition="'$(Configuration)'=='Debug_qt' Or '$(Configuration)'=='Debug_wtl' Or '$(Configuration)'=='Release_qt' Or '$(Configuration)'=='Release_wtl'">true</ExcludedFromBuild>
     </ClInclude>
     <ClInclude Include="..\..\src\N64.h" />
-    <ClInclude Include="..\..\src\NoiseTexture.h" />
     <ClInclude Include="..\..\src\PaletteTexture.h" />
     <ClInclude Include="..\..\src\Performance.h" />
     <ClInclude Include="..\..\src\Platform.h" />
@@ -541,9 +541,11 @@ copy /Y "$(OutDir)$(TargetName).*" "$(Mupen64PluginsDir_x64)")</Command>
     <ClInclude Include="..\..\src\uCodes\F3DBETA.h" />
     <ClInclude Include="..\..\src\uCodes\F3DDKR.h" />
     <ClInclude Include="..\..\src\uCodes\F3DEX.h" />
+    <ClInclude Include="..\..\src\uCodes\F3DEX095.h" />
     <ClInclude Include="..\..\src\uCodes\F3DEX2.h" />
     <ClInclude Include="..\..\src\uCodes\F3DEX2ACCLAIM.h" />
     <ClInclude Include="..\..\src\uCodes\F3DEX2CBFD.h" />
+    <ClInclude Include="..\..\src\uCodes\F3DEX3.h" />
     <ClInclude Include="..\..\src\uCodes\F3DZEX2.h" />
     <ClInclude Include="..\..\src\uCodes\F3DFLX2.h" />
     <ClInclude Include="..\..\src\uCodes\F3DGOLDEN.h" />

GLideN64/projects/msvc/GLideN64.vcxproj.filters

@@ -245,9 +245,6 @@
     <ClCompile Include="..\..\src\Graphics\OpenGLContext\GLSL\glsl_CombinerInputs.cpp">
       <Filter>Source Files\Graphics\OpenGL\GLSL</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\NoiseTexture.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\ZlutTexture.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -443,6 +440,12 @@
     <ClCompile Include="..\..\src\Graphics\OpenGLContext\GLSL\glsl_CombinerProgramUniformFactoryFast.cpp">
       <Filter>Source Files\Graphics\OpenGL\GLSL</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\uCodes\F3DEX3.cpp">
+      <Filter>Source Files\uCodes</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\uCodes\F3DEX095.cpp">
+      <Filter>Source Files\uCodes</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\3DMath.h">
@@ -610,9 +613,6 @@
     <ClInclude Include="..\..\src\Graphics\OpenGLContext\GLSL\glsl_CombinerInputs.h">
       <Filter>Header Files\Graphics\OpenGL\GLSL</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\NoiseTexture.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\Graphics\ShaderProgram.h">
       <Filter>Header Files\Graphics</Filter>
     </ClInclude>
@@ -703,9 +703,15 @@
     <ClInclude Include="..\..\src\uCodes\F3DEX.h">
       <Filter>Header Files\uCodes</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\uCodes\F3DEX095.h">
+      <Filter>Header Files\uCodes</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\src\uCodes\F3DEX2.h">
       <Filter>Header Files\uCodes</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\uCodes\F3DEX3.h">
+      <Filter>Header Files\uCodes</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\src\uCodes\F3DEX2ACCLAIM.h">
       <Filter>Header Files\uCodes</Filter>
     </ClInclude>

GLideN64/src/BufferCopy/ColorBufferToRDRAM.cpp

@@ -214,9 +214,10 @@ void ColorBufferToRDRAM::_copy(u32 _startAddress, u32 _endAddress, bool _sync)
 		u32 *ptr_src = (u32*)pPixels;
 		u16 *ptr_dst = (u16*)(RDRAM + _startAddress);
 		m_blueNoiseIdx++;
-		if ((config.generalEmulation.hacks & hack_subscreen) != 0u && height == 1u)
+		if (gDP.m_subscreen) {
 			copyWhiteToRDRAM(m_pCurFrameBuffer);
-		else
+			gDP.m_subscreen = false;
+		} else
 			writeToRdram<u32, u16>(ptr_src, ptr_dst, &ColorBufferToRDRAM::_RGBAtoRGBA16, dummyTester<u32>, 1, width, height, numPixels, _startAddress, m_pCurFrameBuffer->m_startAddress, m_pCurFrameBuffer->m_size);
 	} else if (m_pCurFrameBuffer->m_size == G_IM_SIZ_8b) {
 		u8 *ptr_src = (u8*)pPixels;

GLideN64/src/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.9)
+cmake_minimum_required(VERSION 3.10)
 
 option(EGL "Set to ON if targeting an EGL device" ${EGL})
 option(PANDORA "Set to ON if targeting an OpenPandora" ${PANDORA})
@@ -59,7 +59,6 @@ set(GLideN64_SOURCES
   gSP.cpp
   Log.cpp
   N64.cpp
-  NoiseTexture.cpp
   PaletteTexture.cpp
   Performance.cpp
   PostProcessor.cpp
@@ -121,8 +120,10 @@ set(GLideN64_SOURCES
   uCodes/F3DBETA.cpp
   uCodes/F3DDKR.cpp
   uCodes/F3DEX.cpp
+  uCodes/F3DEX095.cpp
   uCodes/F3DAM.cpp
   uCodes/F3DEX2.cpp
+  uCodes/F3DEX3.cpp
   uCodes/F3DEX2ACCLAIM.cpp
   uCodes/F3DEX2CBFD.cpp
   uCodes/F3DZEX2.cpp
@@ -192,9 +193,10 @@ if( NOT CMAKE_BUILD_TYPE)
         set( CMAKE_BUILD_TYPE Release)
 endif( NOT CMAKE_BUILD_TYPE)
 
-if(CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "MinSizeRel")
+if(CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "MinSizeRel" OR
+   CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
         set(GLIDEN64_BUILD_TYPE Release)
-elseif(CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
+elseif(CMAKE_BUILD_TYPE STREQUAL "Debug")
         set(GLIDEN64_BUILD_TYPE Debug)
 endif()
 
@@ -520,7 +522,7 @@ else(EGL)
   endif(NOT OPENGL_FOUND)
 endif(EGL)
 
-if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
   #check for compiler version
   execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE G++_VERSION)
   if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND G++_VERSION VERSION_LESS 4.8)

GLideN64/src/CommonPluginAPI.cpp

@@ -5,6 +5,7 @@
 #endif // OS_WINDOWS
 
 #include "PluginAPI.h"
+#include "DisplayWindow.h"
 
 extern "C" {
 
@@ -79,4 +80,14 @@ EXPORT void CALL gln64FBWList(FrameBufferModifyEntry *plist, unsigned int size)
 	api().FBWList(plist, size);
 }
 #endif
+
+EXPORT void CALL gln64DestroyGfxContext(void)
+{
+	dwnd().destroyGfxContext();
+}
+
+EXPORT void CALL gln64ReinitGfxContext(void)
+{
+	dwnd().reinitGfxContext();
+}
 }