Built-in OpenGL ES over Swiftshader is now deprecated.

pal1000 · Sep 6, 2021 · 47c264a · 47c264a
1 parent c726108
commit 47c264a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -24,7 +24,7 @@ jobs:
           git clone --depth=1 https://swiftshader.googlesource.com/SwiftShader swiftshader
           git clone https://github.com/pal1000/swiftshader-dist-win.git swiftshader-dist-win
           cd swiftshader-dist-win
-          git checkout 1.0.6b
+          git checkout 1.0.6c
           cd ..
         displayName: Get sources
       - script: swiftshader-dist-win\buildscript\ci\ci.cmd collectuids

diff --git a/buildscript/modules/dist.cmd b/buildscript/modules/dist.cmd
@@ -9,6 +9,8 @@
 @IF EXIST translator RD /S /Q translator
 @md translator
 @move *translator.dll translator
+@REN libEGL_deprecated.dll libEGL.dll
+@REN libGLESv2_deprecated.dll libGLESv2.dll
 @echo.
 @endlocal
 @cd %devroot%

diff --git a/buildscript/modules/swiftshader.cmd b/buildscript/modules/swiftshader.cmd
@@ -72,8 +72,8 @@
 @IF %cimode% EQU 0 set /p gles-swiftshader=Build SwiftShader GLES Drivers - default^:no (y/n)^:
 @IF %cimode% EQU 1 echo Build SwiftShader GLES Drivers - default^:no (y/n)^:%gles-swiftshader%
 @echo.
-@IF /I "%gles-swiftshader%"=="y" set buildconf=%buildconf% -DSWIFTSHADER_BUILD_EGL=ON -DSWIFTSHADER_BUILD_GLES_CM=ON -DSWIFTSHADER_BUILD_GLESv2=ON
-@IF /I NOT "%gles-swiftshader%"=="y" set buildconf=%buildconf% -DSWIFTSHADER_BUILD_EGL=OFF -DSWIFTSHADER_BUILD_GLES_CM=OFF -DSWIFTSHADER_BUILD_GLESv2=OFF
+@IF /I "%gles-swiftshader%"=="y" set buildconf=%buildconf% -DSWIFTSHADER_BUILD_EGL=ON -DSWIFTSHADER_BUILD_GLESv2=ON
+@IF /I NOT "%gles-swiftshader%"=="y" set buildconf=%buildconf% -DSWIFTSHADER_BUILD_EGL=OFF -DSWIFTSHADER_BUILD_GLESv2=OFF
 
 @IF %cimode% EQU 0 set "subzerojit="
 @IF %cimode% EQU 0 set /p subzerojit=Use Subzero JIT instead of LLVM - default^:no (y/n)^: