Merge remote-tracking branch 'upstream/xd_dev' into xd_dev

Author: q4a

CMakeLists.txt

@@ -1,6 +1,7 @@
 cmake_minimum_required(VERSION 2.8.0)
 project(OpenXRay)
 
+include(${PROJECT_SOURCE_DIR}/cmake/utils.cmake)
 set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive --std=c++17")

cmake/utils.cmake

@@ -0,0 +1,11 @@
+macro(add_dir DIRS)
+  foreach(dir ${DIRS})
+	message( "adding " ${dir} )
+	include_directories  (${dir} )
+	file( GLOB ${dir}__INCLUDES_H ${dir} *.h)
+	file( GLOB ${dir}__INCLUDES_HPP ${dir} *.hpp)
+	list( APPEND XRCORE__INCLUDES ${${dir}__INCLUDES_H} ${${dir}__INCLUDES_HPP} )	
+	file( GLOB ${dir}__SOURCES ${dir} *.cpp) 
+	list( APPEND XRCORE__SOURCES ${${dir}__SOURCES} )	
+  endforeach()
+endmacro()

src/Common/PlatformLinux.inl

@@ -44,12 +44,15 @@
 #define __cdecl
 #define __stdcall
 #define __fastcall
+
 //#define __declspec
 #define __forceinline FORCE_INLINE
-#define __pragma
+#define __pragma(...) _Pragma(#__VA_ARGS__)
 #define __declspec(x)
 #define CALLBACK
 
+#define __except(X) catch(X)
+
 /*
 static inline long InterlockedExchange(volatile long *val, long new_val)
 {
@@ -60,11 +63,6 @@ static inline long InterlockedExchange(volatile long *val, long new_val)
     return old_val;
 }
 */
-//TODO: Implement more platform independend atomic operations: https://github.com/dolphin-emu/dolphin/blob/master/Source/Core/Common/Atomic_GCC.h
-inline void InterlockedExchange(volatile unsigned int& target, unsigned int value)
-{
-    __sync_add_and_fetch(&target, value);
-}
 
 inline pthread_t GetCurrentThreadId()
 {
@@ -89,9 +87,14 @@ inline unsigned long GetLastError()
     return 0;
 }
 
+inline int GetExceptionCode()
+{
+    return 0;
+}
+
 #define xr_unlink unlink
 
-typedef int BOOL;
+typedef char BOOL;
 typedef char* LPSTR;
 typedef char* PSTR;
 typedef char* LPTSTR;
@@ -103,17 +106,16 @@ typedef unsigned int UINT;
 typedef int INT;
 typedef long LONG;
 typedef unsigned long ULONG;
-typedef unsigned long ULONG_PTR, *PULONG_PTR;
-//typedef unsigned long& ULONG_PTR;
-//typedef long long int LARGE_INTEGER;
-//typedef unsigned long long int ULARGE_INTEGER;
+typedef unsigned long& ULONG_PTR;
+typedef long long int LARGE_INTEGER;
+typedef unsigned long long int ULARGE_INTEGER;
 
 typedef unsigned short WORD;
 typedef unsigned short* LPWORD;
 typedef unsigned long DWORD;
 typedef unsigned long* LPDWORD;
 typedef const void *LPCVOID;
-//typedef long long int *PLARGE_INTEGER;
+typedef long long int *PLARGE_INTEGER;
 
 typedef wchar_t WCHAR;
 
@@ -142,7 +144,7 @@ typedef unsigned int UINT_PTR;
 typedef long LONG_PTR;
 #endif // XR_X64
 
-typedef void *HANDLE;
+typedef int HANDLE;
 typedef void *HMODULE;
 typedef void *LPVOID;
 typedef UINT_PTR WPARAM;
@@ -216,6 +218,12 @@ typedef dirent DirEntryType;
 #define _close close
 #define _sopen open
 #define _sopen_s(handle, filename, ...) open(filename, O_RDONLY)
+inline int _filelength(int fd)
+{
+    struct stat file_info;
+    ::fstat(fd, &file_info);
+    return file_info.st_size;
+}
 #define _fdopen fdopen
 #define _rmdir rmdir
 #define _write write
@@ -230,6 +238,10 @@ typedef dirent DirEntryType;
 #undef max
 #define __max(a, b) std::max(a, b)
 #define __min(a, b) std::min(a, b)
+#define _utime utime
+#define _utimbuf utimbuf
+
+#define xr_itoa SDL_itoa
 
 #define ZeroMemory(p, sz) memset((p), 0, (sz))
 #define CopyMemory(d, s, n) memcpy(d, s, n)
@@ -241,14 +253,7 @@ typedef dirent DirEntryType;
 #define S_FALSE 0x10000000
 #define E_FAIL 0x80004005
 
-#define STUBBED(txt) do { \
-  static bool already_seen = false; \
-  if (!already_seen) { \
-    already_seen = true; \
-    fprintf(stderr, "STUBBED: %s in %s, line %d.\n", txt, __FILE__, __LINE__); \
-  } \
-} while (0)
-
-#if __EXCEPTIONS
-#define _CPPUNWIND 1
-#endif
+#define _MAX_DRIVE	3
+#define _MAX_DIR	256
+#define _MAX_FNAME	256
+#define _MAX_EXT	256

src/Layers/xrRender/HW.cpp

@@ -21,10 +21,10 @@ CHW::~CHW() {}
 void CHW::CreateD3D()
 {
     hD3D = XRay::LoadModule(GEnv.isDedicatedServer ? "xrD3D9-Null" : "d3d9.dll");
-    R_ASSERT2(hD3D->exist(), "Can't find 'd3d9.dll'\nPlease install latest version of DirectX before running this program");
+    R_ASSERT2(hD3D->IsLoaded(), "Can't find 'd3d9.dll'\nPlease install latest version of DirectX before running this program");
 
     using _Direct3DCreate9 = IDirect3D9* WINAPI(UINT SDKVersion);
-    auto createD3D = (_Direct3DCreate9*)hD3D->getProcAddress("Direct3DCreate9");
+    auto createD3D = (_Direct3DCreate9*)hD3D->GetProcAddress("Direct3DCreate9");
     R_ASSERT(createD3D);
     pD3D = createD3D(D3D_SDK_VERSION);
     R_ASSERT2(pD3D, "Please install DirectX 9.0c");

src/Layers/xrRender/R_Backend.h

@@ -322,7 +322,7 @@ class ECORE_API CBackend
 #else
     ICF void set_GS(ID3DGeometryShader* _gs, LPCSTR _n = nullptr);
 #endif // USE_OGL
-    ICF void set_GS(ref_gs& _gs) { set_GS(_gs->gs, _gs->cName.c_str()); }
+    ICF void set_GS(ref_gs& _gs) { set_GS(_gs->sh, _gs->cName.c_str()); }
 
 #	ifdef USE_DX11
     ICF void set_HS(ID3D11HullShader* _hs, LPCSTR _n = nullptr);

src/Layers/xrRender/ResourceManager.h

@@ -37,6 +37,7 @@ class ECORE_API CResourceManager
     using map_RT = xr_map<const char*, CRT*, str_pred>;
     //	DX10 cut DEFINE_MAP_PRED(const char*,CRTC*,			map_RTC,		map_RTCIt,			str_pred);
     using map_VS = xr_map<const char*, SVS*, str_pred>;
+
 #if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
     using map_GS = xr_map<const char*, SGS*, str_pred>;
 #endif //	USE_DX10
@@ -59,9 +60,17 @@ class ECORE_API CResourceManager
     //	DX10 cut map_RTC												m_rtargets_c;
     map_VS m_vs;
     map_PS m_ps;
+
 #if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
     map_GS m_gs;
-#endif //	USE_DX10
+#endif
+
+#if defined(USE_DX11)
+    map_DS m_ds;
+    map_HS m_hs;
+    map_CS m_cs;
+#endif
+
     map_TD m_td;
 
     xr_vector<SState*> v_states;
@@ -239,11 +248,7 @@ class ECORE_API CResourceManager
     void Dump(bool bBrief);
 
 private:
-#ifdef USE_DX11
-    map_DS m_ds;
-    map_HS m_hs;
-    map_CS m_cs;
-
+#if defined(USE_DX10) || defined(USE_DX11)
     template <typename T>
     T& GetShaderMap();
 
@@ -252,8 +257,7 @@ class ECORE_API CResourceManager
 
     template <typename T>
     void DestroyShader(const T* sh);
-
-#endif //	USE_DX10
+#endif
 };
 
 #endif // ResourceManagerH

src/Layers/xrRender/SH_Atomic.cpp

@@ -66,9 +66,9 @@ SPS::~SPS()
 SGS::~SGS()
 {
 #ifdef USE_OGL
-    CHK_GL(glDeleteProgram(gs));
+    CHK_GL(glDeleteProgram(sh));
 #else
-    _RELEASE(gs);
+    _RELEASE(sh);
 #endif // USE_OGL
     RImplementation.Resources->_DeleteGS(this);
 }

src/Layers/xrRender/SH_Atomic.h

@@ -58,9 +58,9 @@ typedef resptr_core<SPS, resptr_base<SPS>> ref_ps;
 struct ECORE_API SGS : public xr_resource_named
 {
 #ifdef USE_OGL
-    GLuint gs;
+    GLuint sh;
 #else
-    ID3DGeometryShader* gs;
+    ID3DGeometryShader* sh;
 #endif
     R_constant_table constants;
     ~SGS();

src/Layers/xrRender/ShaderResourceTraits.h

@@ -1,12 +1,55 @@
 #pragma once
 
-#ifdef USE_DX11
+#if defined(USE_DX10) || defined(USE_DX11)
 
 #include "ResourceManager.h"
 
 template <typename T>
 struct ShaderTypeTraits;
 
+#if defined(USE_DX10) || defined(USE_DX11)
+template <>
+struct ShaderTypeTraits<SGS>
+{
+    typedef CResourceManager::map_GS MapType;
+    typedef ID3DGeometryShader DXIface;
+
+    static inline const char* GetShaderExt() { return ".gs"; }
+    static inline const char* GetCompilationTarget()
+    {
+#ifdef USE_DX10
+        if (HW.pDevice1 == 0)
+            return D3D10GetGeometryShaderProfile(HW.pDevice);
+        else
+            return "gs_4_1";
+#endif
+#ifdef USE_DX11
+        if (HW.FeatureLevel == D3D_FEATURE_LEVEL_10_0)
+            return "gs_4_0";
+        else if (HW.FeatureLevel == D3D_FEATURE_LEVEL_10_1)
+            return "gs_4_1";
+        else if (HW.FeatureLevel == D3D_FEATURE_LEVEL_11_0)
+            return "gs_5_0";
+#endif
+        NODEFAULT;
+        return "gs_4_0";
+    }
+    static inline DXIface* CreateHWShader(DWORD const* buffer, size_t size)
+    {
+        DXIface* gs = 0;
+#ifdef USE_DX11
+        R_CHK(HW.pDevice->CreateGeometryShader(buffer, size, 0, &gs));
+#else
+        R_CHK(HW.pDevice->CreateGeometryShader(buffer, size, &gs));
+#endif       
+        return gs;
+    }
+
+    static inline u32 GetShaderDest() { return RC_dest_geometry; }
+};
+#endif
+
+#ifdef USE_DX11
 template <>
 struct ShaderTypeTraits<SHS>
 {
@@ -60,7 +103,17 @@ struct ShaderTypeTraits<SCS>
 
     static inline u32 GetShaderDest() { return RC_dest_compute; }
 };
+#endif
+
+#if defined(USE_DX10) || defined(USE_DX11)
+template <>
+inline CResourceManager::map_GS& CResourceManager::GetShaderMap()
+{
+    return m_gs;
+}
+#endif
 
+#if defined(USE_DX11)
 template <>
 inline CResourceManager::map_DS& CResourceManager::GetShaderMap()
 {
@@ -78,16 +131,17 @@ inline CResourceManager::map_CS& CResourceManager::GetShaderMap()
 {
     return m_cs;
 }
+#endif
 
 template <typename T>
 inline T* CResourceManager::CreateShader(const char* name)
 {
     ShaderTypeTraits<T>::MapType& sh_map = GetShaderMap<ShaderTypeTraits<T>::MapType>();
     LPSTR N = LPSTR(name);
-    ShaderTypeTraits<T>::MapType::iterator I = sh_map.find(N);
+    auto iterator = sh_map.find(N);
 
-    if (I != sh_map.end())
-        return I->second;
+    if (iterator != sh_map.end())
+        return iterator->second;
     else
     {
         T* sh = new T();
@@ -100,6 +154,7 @@ inline T* CResourceManager::CreateShader(const char* name)
             return sh;
         }
 
+        // Remove ( and everything after it
         string_path shName;
         const char* pchr = strchr(name, '(');
         ptrdiff_t strSize = pchr ? pchr - name : xr_strlen(name);
@@ -114,6 +169,15 @@ inline T* CResourceManager::CreateShader(const char* name)
 
         // duplicate and zero-terminate
         IReader* file = FS.r_open(cname);
+        if (!file && strstr(Core.Params, "-lack_of_shaders"))
+        {
+            string1024 tmp;
+            xr_sprintf(tmp, "CreateShader: %s is missing. Replacing it with stub_default%s", cname, ShaderTypeTraits<T>::GetShaderExt());
+            Msg(tmp);
+            strconcat(sizeof(cname), cname, GEnv.Render->getShaderPath(), "stub_default", ShaderTypeTraits<T>::GetShaderExt());
+            FS.update_path(cname, "$game_shaders$", cname);
+            file = FS.r_open(cname);
+        }
         R_ASSERT2(file, cname);
 
         // Select target
@@ -137,17 +201,17 @@ inline T* CResourceManager::CreateShader(const char* name)
 template <typename T>
 inline void CResourceManager::DestroyShader(const T* sh)
 {
-    ShaderTypeTraits<T>::MapType& sh_map = GetShaderMap<ShaderTypeTraits<T>::MapType>();
-
     if (0 == (sh->dwFlags & xr_resource_flagged::RF_REGISTERED))
         return;
 
+    ShaderTypeTraits<T>::MapType& sh_map = GetShaderMap<ShaderTypeTraits<T>::MapType>();
+
     LPSTR N = LPSTR(*sh->cName);
-    typename ShaderTypeTraits<T>::MapType::iterator I = sh_map.find(N);
+    auto iterator = sh_map.find(N);
 
-    if (I != sh_map.end())
+    if (iterator != sh_map.end())
     {
-        sh_map.erase(I);
+        sh_map.erase(iterator);
         return;
     }
     Msg("! ERROR: Failed to find compiled geometry shader '%s'", *sh->cName);