Merge branch 'master' into mapbase

Author: halotroop2288

.github/workflows/build.yml

@@ -1,16 +1,10 @@
 name: Build
 
-on:
-  push:
-    branches:
-      - "*"
-  pull_request:
-    branches:
-      - "*"
+on: [push, pull_request]
 
 jobs:
   build-linux-i386:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v2
@@ -19,7 +13,7 @@ jobs:
         scripts/build-ubuntu-i386.sh
 
   build-linux-amd64:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     steps:
     - uses: actions/checkout@v2
@@ -28,7 +22,7 @@ jobs:
         scripts/build-ubuntu-amd64.sh
 
   build-android-armv7a:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     steps:
     - uses: actions/checkout@v2
@@ -42,6 +36,17 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Build windows-i386
+      run: |
+        git submodule init && git submodule update
+        ./waf.bat configure -T debug --32bits
+        ./waf.bat build
+
+  build-windows-amd64:
+    runs-on: windows-2019
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Build windows-amd64
       run: |
         git submodule init && git submodule update
         ./waf.bat configure -T debug
@@ -58,8 +63,19 @@ jobs:
         ./waf.bat configure -T debug -d
         ./waf.bat build
 
+  build-dedicated-windows-amd64:
+    runs-on: windows-2019
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Build dedicated windows-amd64
+      run: |
+        git submodule init && git submodule update
+        ./waf.bat configure -T debug -d
+        ./waf.bat build
+
   build-dedicated-linux-i386:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     steps:
     - uses: actions/checkout@v2
@@ -68,10 +84,28 @@ jobs:
         scripts/build-ubuntu-i386.sh -d
 
   build-dedicated-linux-amd64:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     steps:
     - uses: actions/checkout@v2
     - name: Build dedicated linux-amd64
       run: |
         scripts/build-ubuntu-amd64.sh -d
+
+  build-macos-amd64:
+    runs-on: macos-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Build macos-amd64
+      run: |
+        scripts/build-macos-amd64.sh
+
+  build-dedicated-macos-amd64:
+    runs-on: macos-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Build dedicated macos-amd64
+      run: |
+        scripts/build-macos-amd64.sh -d

.github/workflows/tests.yml

@@ -1,16 +1,10 @@
 name: Tests
 
-on:
-  push:
-    branches:
-      - "*"
-  pull_request:
-    branches:
-      - "*"
+on: [push, pull_request]
 
 jobs:
   tests-linux-i386:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     steps:
     - uses: actions/checkout@v2
@@ -19,20 +13,43 @@ jobs:
         scripts/tests-ubuntu-i386.sh
 
   tests-linux-amd64:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     steps:
     - uses: actions/checkout@v2
     - name: Run tests linux-amd64
       run: |
         scripts/tests-ubuntu-amd64.sh
 
+  tests-macos-amd64:
+    runs-on: macos-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Run tests macos-amd64
+      run: |
+        scripts/tests-macos-amd64.sh
+
   tests-windows-i386:
     runs-on: windows-2019
 
     steps:
     - uses: actions/checkout@v2
     - name: Run tests windows-i386
+      run: |
+        git submodule init && git submodule update
+        ./waf.bat configure -T release --tests --prefix=out/ --32bits
+        ./waf.bat install
+        cd out
+        $env:Path = "bin";
+        ./unittest.exe
+
+  tests-windows-amd64:
+    runs-on: windows-2019
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Run tests windows-amd64
       run: |
         git submodule init && git submodule update
         ./waf.bat configure -T release --tests --prefix=out/

.vscode/tasks.json

@@ -0,0 +1,64 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "Configure Waf for Debug 32-bit",
+            "type": "shell",
+            "command": "./waf configure -T debug --prefix=build/out/",
+            "problemMatcher": [],
+            "windows": {
+                "command": "./waf.bat configure -T debug --prefix=build/out/"
+            },
+            "osx": {
+                "command": "python3 waf configure -T debug --prefix=build/out/"
+            }
+        },
+        {
+            "label": "Configure Waf for Debug 64-bit",
+            "type": "shell",
+            "command": "./waf configure -T debug --64bits --prefix=build/out/",
+            "problemMatcher": [],
+            "windows": {
+                "command": "./waf.bat configure -T debug --64bits --prefix=build/out/"
+            },
+            "osx": {
+                "command": "python3 waf configure -T debug --64bits --prefix=build/out/"
+            }
+        },
+        {
+            "label": "Configure Waf for Debug on Android (NDK r10e)",
+            "type": "shell",
+            "command": "./waf configure -T debug --android=armeabi-v7a-hard,4.9,21",
+            "problemMatcher": [],
+            "windows": {
+                "command": "./waf.bat configure -T debug --android=armeabi-v7a-hard,4.9,21"
+            },
+            "osx": {
+                "command": "python3 waf configure -T debug --android=armeabi-v7a-hard,4.9,21"
+            }
+        },
+        {
+            "label": "Build",
+            "type": "shell",
+            "command": "./waf install",
+            "problemMatcher": {
+                "base": "$gcc",
+                "fileLocation": ["relative", "${workspaceFolder}/build"]
+            },
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+            "windows": {
+                "command": "./waf.bat install",
+                "problemMatcher": {
+                    "base": "$msCompile",
+                    "fileLocation": ["relative", "${workspaceFolder}/build"]
+                }
+            },
+            "osx": {
+                "command": "python3 waf install"
+            }
+        }
+    ]
+}

README.md

@@ -15,7 +15,7 @@ Source code is based on TF2 2018 leak. Don't use it for commercial purposes.
 This project is using waf buildsystem. If you have waf-related questions look https://waf.io/book
 
 # Features:
-- Android, OSX, FreeBSD, Windows support
+- Android, OSX, FreeBSD, Windows, Linux( glibc, musl ) support
 - Arm support( except windows )
 - 64bit support
 - Modern toolchains support
@@ -28,18 +28,17 @@ This project is using waf buildsystem. If you have waf-related questions look ht
 - Removed useless/unnecessary dependencies
 - Achivement system working without steam
 - Fixed many bugs
+- Serverbrowser works without steam
 
 # Current tasks
 - Rewrite materialsystem for OpenGL render
 - dxvk-native support
 - Elbrus port
 - Bink audio support( for video_bink )
-- Rewrite serverbrowser to work without steam
 
 # How to Build?
-- [Windows](https://github.com/nillerusr/source-engine/wiki/How-to-build#on-windows)
-- [Linux](https://github.com/nillerusr/source-engine/wiki/How-to-build#on-linux)
-- [For Android under Linux](https://github.com/nillerusr/source-engine/wiki/How-to-build#on-linux-for-android)
+- [Building instructions(EN)](https://github.com/nillerusr/source-engine/wiki/Source-Engine-(EN))
+- [Building instructions(RU)](https://github.com/nillerusr/source-engine/wiki/Source-Engine-(RU))
 
 # Support me
 BTC: `bc1qnjq92jj9uqjtafcx2zvnwd48q89hgtd6w8a6na`

appframework/posixapp.cpp

@@ -14,7 +14,10 @@
 #include "filesystem_init.h"
 #include "tier1/convar.h"
 #include "vstdlib/cvar.h"
+
+#ifndef DEDICATED
 #include "togl/rendermechanism.h"
+#endif
 
 // NOTE: This has to be the last file included! (turned off below, since this is included like a header)
 #include "tier0/memdbgon.h"

appframework/sdlmgr.cpp

@@ -404,6 +404,9 @@ class CSDLMgr : public ILauncherMgr
 	int m_MouseButtonDownX;
 	int m_MouseButtonDownY;
 
+	bool m_bResetVsync;
+	int m_nFramesToSkip;
+
 	double m_flPrevGLSwapWindowTime;
 };
 
@@ -584,6 +587,9 @@ InitReturnVal_t CSDLMgr::Init()
 	m_nWarpDelta = 0;
 	m_bRawInput = false;
 
+	m_nFramesToSkip = 0;
+	m_bResetVsync = false;
+
 	m_flPrevGLSwapWindowTime = 0.0f;
 
 	memset(m_pixelFormatAttribs, '\0', sizeof (m_pixelFormatAttribs));
@@ -1431,7 +1437,20 @@ void CSDLMgr::ShowPixels( CShowPixelsParams *params )
 
 	m_flPrevGLSwapWindowTime = tm.GetDurationInProgress().GetMillisecondsF();
 
-	
+#ifdef ANDROID
+	// ADRENO GPU MOMENT, SKIP 5 FRAMES
+	if( m_bResetVsync )
+	{
+		if( m_nFramesToSkip <= 0 )
+		{
+			SDL_GL_SetSwapInterval(swapInterval);
+			m_bResetVsync = false;
+		}
+		else
+			m_nFramesToSkip--;
+	}
+#endif
+
 	CheckGLError( __LINE__ );
 }
 #endif // DX_TO_GL_ABSTRACTION
@@ -1887,6 +1906,7 @@ void CSDLMgr::PumpWindowsMessageLoop()
 					}
 					case SDL_WINDOWEVENT_FOCUS_GAINED:
 					{
+						m_bResetVsync = true; m_nFramesToSkip = 3;
 						m_bHasFocus = true;
 						SDL_ShowCursor( m_bCursorVisible ? 1 : 0 );
 						CCocoaEvent theEvent;
@@ -2224,7 +2244,7 @@ GLMDisplayDB *CSDLMgr::GetDisplayDB( void )
 }
 
 #ifndef OSX
-# include "glmdisplaydb_linuxwin.inl"
+#include "glmdisplaydb_linuxwin.inl"
 #endif
 
 

appframework/wscript

@@ -24,11 +24,10 @@ def build(bld):
 		source += [
 			'sdlmgr.cpp'
 		]
-	
-	if bld.env.DEST_OS == 'darwin':
-		source += [
-			'glmrendererinfo_osx.mm'
-		]
+
+	if bld.env.DEST_OS == 'darwin' and bld.env.GL:
+		source += ['glmrendererinfo_osx.mm']
+
 
 	if bld.env.DEST_OS == 'win32':
 		source += [

bitmap/ImageByteSwap.cpp

@@ -88,14 +88,7 @@ namespace ImageLoader
 
 		Assert( IsFormatValidForConversion( imageFormat ) );
 
-#if !defined( DX_TO_GL_ABSTRACTION ) && !defined( NO_X360_XDK )
-		if ( IsPC() )
-		{
-			// running as a win32 tool, data is in expected order
-			// for conversion code
-			return;
-		}
-
+#ifdef _X360
 		// running on 360 and converting, input data must be x86 order
 		// swap to ensure conversion code gets valid data
 		XGENDIANTYPE xEndian;
@@ -137,7 +130,7 @@ namespace ImageLoader
 	{
 		Assert( IsFormatValidForConversion( imageFormat ) );
 
-#if !defined( DX_TO_GL_ABSTRACTION ) && !defined( NO_X360_XDK )
+#ifdef _X360
 		// It would have been nice to use the 360 D3DFORMAT bit encodings, but the codes
 		// are different for win32, and this routine is used by a win32 library to
 		// manipulate 360 data, so there can be no reliance on D3DFORMAT bits
@@ -201,7 +194,7 @@ namespace ImageLoader
 	{
 		Assert( IsFormatValidForConversion( imageFormat ) );
 
-#if !defined( DX_TO_GL_ABSTRACTION ) && !defined( NO_X360_XDK )
+#ifdef _X360
 		XGENDIANTYPE xEndian;
 		switch ( imageFormat )
 		{
@@ -256,5 +249,4 @@ namespace ImageLoader
 		}
 #endif
 	}
-	
 }