Merge branch 'xd_dev' of https://github.com/OpenXRay/xray-16 into sync

Author: Zegeri

Externals/luabind.vcxproj

@@ -172,7 +172,6 @@
     <ClInclude Include="luabind\luabind\scope.hpp" />
     <ClInclude Include="luabind\luabind\set_package_preload.hpp" />
     <ClInclude Include="luabind\luabind\shared_ptr_converter.hpp" />
-    <ClInclude Include="luabind\luabind\tag_function.hpp" />
     <ClInclude Include="luabind\luabind\typeid.hpp" />
     <ClInclude Include="luabind\luabind\types.hpp" />
     <ClInclude Include="luabind\luabind\version.hpp" />

Externals/luabind.vcxproj.filters

@@ -355,9 +355,6 @@
     <ClInclude Include="luabind\luabind\shared_ptr_converter.hpp">
       <Filter>include</Filter>
     </ClInclude>
-    <ClInclude Include="luabind\luabind\tag_function.hpp">
-      <Filter>include</Filter>
-    </ClInclude>
     <ClInclude Include="luabind\luabind\typeid.hpp">
       <Filter>include</Filter>
     </ClInclude>

src/Include/xrAPI/xrAPI.h

@@ -11,7 +11,7 @@ class CRender;
 class CScriptEngine;
 class AISpaceBase;
 class ISoundManager;
-class ui_core;
+class UICore;
 
 class XRAPI_API EngineGlobalEnvironment
 {
@@ -28,7 +28,7 @@ class XRAPI_API EngineGlobalEnvironment
     CScriptEngine* ScriptEngine;
     AISpaceBase* AISpace;
     ISoundManager* Sound;
-    ui_core* UI;
+    UICore* UI;
 
     bool isEditor;
     bool isDedicatedServer;

src/Layers/xrRender/HW.h

@@ -128,6 +128,8 @@ class CHW
     void UpdateViews();
 #endif
 #if defined(USE_DX10) || defined(USE_DX11)
+    bool CheckFormatSupport(DXGI_FORMAT format, D3D_FORMAT_SUPPORT feature) const;
+    DXGI_FORMAT SelectFormat(D3D_FORMAT_SUPPORT feature, const DXGI_FORMAT formats[], size_t count) const;
     virtual void OnAppActivate();
     virtual void OnAppDeactivate();
 #endif //	USE_DX10

src/Layers/xrRender/ResourceManager.h

@@ -258,7 +258,7 @@ class ECORE_API CResourceManager
     T* CreateShader(const char* name, const char* filename = nullptr, const bool searchForEntryAndTarget = false);
 
     template <typename T>
-    void DestroyShader(const T* sh);
+    bool DestroyShader(const T* sh);
 };
 
 #endif // ResourceManagerH

src/Layers/xrRender/ShaderResourceTraits.h

@@ -392,14 +392,13 @@ inline T* CResourceManager::CreateShader(const char* name, const char* filename
             FS.update_path(cname, "$game_shaders$", cname);
             file = FS.r_open(cname);
         }
-        R_ASSERT2(file, cname);
+        R_ASSERT3(file, "Shader file doesnt exist:", cname);
 
         // Duplicate and zero-terminate
         const auto size = file->length();
         char* const data = (LPSTR)_alloca(size + 1);
         CopyMemory(data, file->pointer(), size);
         data[size] = 0;
-        FS.r_close(file);
 
         // Select target
         LPCSTR c_target = ShaderTypeTraits<T>::GetCompilationTarget();
@@ -417,8 +416,9 @@ inline T* CResourceManager::CreateShader(const char* name, const char* filename
 #endif
 
         // Compile
-        HRESULT const _hr = GEnv.Render->shader_compile(name, (DWORD const*)data, size,
-            c_entry, c_target, flags, (void*&)sh);
+        HRESULT const _hr = GEnv.Render->shader_compile(name, file, c_entry, c_target, flags, (void*&)sh);
+
+        FS.r_close(file);
 
         VERIFY(SUCCEEDED(_hr));
 
@@ -432,10 +432,10 @@ inline T* CResourceManager::CreateShader(const char* name, const char* filename
 }
 
 template <typename T>
-inline void CResourceManager::DestroyShader(const T* sh)
+bool CResourceManager::DestroyShader(const T* sh)
 {
     if (0 == (sh->dwFlags & xr_resource_flagged::RF_REGISTERED))
-        return;
+        return false;
 
    typename ShaderTypeTraits<T>::MapType& sh_map = GetShaderMap<typename ShaderTypeTraits<T>::MapType>();
 
@@ -445,7 +445,9 @@ inline void CResourceManager::DestroyShader(const T* sh)
     if (iterator != sh_map.end())
     {
         sh_map.erase(iterator);
-        return;
+        return true;
     }
+
     Msg("! ERROR: Failed to find compiled shader '%s'", sh->cName.c_str());
+    return false;
 }

src/Layers/xrRenderDX10/3DFluid/dx103DFluidData.cpp

@@ -5,10 +5,17 @@
 
 namespace
 {
-const xr_token simulation_type_token[] = {{"Fog", dx103DFluidData::ST_FOG}, {"Fire", dx103DFluidData::ST_FIRE}, {0, 0}};
+const xr_token simulation_type_token[] = {
+    {"Fog", dx103DFluidData::ST_FOG},
+    {"Fire", dx103DFluidData::ST_FIRE},
+    {0, 0}
+};
 
-const xr_token emitter_type_token[] = {{"SimpleGaussian", dx103DFluidEmitters::ET_SimpleGausian},
-    {"SimpleDraught", dx103DFluidEmitters::ET_SimpleDraught}, {0, 0}};
+const xr_token emitter_type_token[] = {
+    {"SimpleGaussian", dx103DFluidEmitters::ET_SimpleGausian},
+    {"SimpleDraught", dx103DFluidEmitters::ET_SimpleDraught},
+    {0, 0}
+};
 }
 
 DXGI_FORMAT dx103DFluidData::m_VPRenderTargetFormats[VP_NUM_TARGETS] = {
@@ -20,7 +27,7 @@ DXGI_FORMAT dx103DFluidData::m_VPRenderTargetFormats[VP_NUM_TARGETS] = {
 dx103DFluidData::dx103DFluidData()
 {
     D3D_TEXTURE3D_DESC desc;
-    desc.BindFlags = D3D10_BIND_SHADER_RESOURCE | D3D10_BIND_RENDER_TARGET;
+    desc.BindFlags = D3D_BIND_SHADER_RESOURCE | D3D_BIND_RENDER_TARGET;
     desc.CPUAccessFlags = 0;
     desc.MipLevels = 1;
     desc.MiscFlags = 0;

src/Layers/xrRenderDX10/3DFluid/dx103DFluidManager.cpp

@@ -104,7 +104,7 @@ void dx103DFluidManager::Initialize(int width, int height, int depth)
     InitShaders();
 
     D3D_TEXTURE3D_DESC desc;
-    desc.BindFlags = D3D10_BIND_SHADER_RESOURCE | D3D10_BIND_RENDER_TARGET;
+    desc.BindFlags = D3D_BIND_SHADER_RESOURCE | D3D_BIND_RENDER_TARGET;
     desc.CPUAccessFlags = 0;
     desc.MipLevels = 1;
     desc.MiscFlags = 0;

src/Layers/xrRenderDX10/Blender_Recorder_R3.cpp

@@ -197,6 +197,7 @@ void CBlender_Compile::r_Pass(LPCSTR _vs, LPCSTR _gs, LPCSTR _ps, bool bFog, BOO
 #ifdef USE_DX11
     dest.hs = RImplementation.Resources->_CreateHS("null");
     dest.ds = RImplementation.Resources->_CreateDS("null");
+    dest.cs = RImplementation.Resources->_CreateCS("null");
 #endif
     ctable.merge(&ps->constants);
     ctable.merge(&vs->constants);

src/Layers/xrRenderDX10/DXCommonTypes.h

@@ -88,6 +88,8 @@ typedef ID3D11DeviceContext ID3DDeviceContext;
 #define D3D_CULL_FRONT D3D11_CULL_FRONT
 #define D3D_CULL_BACK D3D11_CULL_BACK
 
+#define D3D_CREATE_DEVICE_DEBUG D3D11_CREATE_DEVICE_DEBUG
+
 #define D3D_COMPARISON_NEVER D3D11_COMPARISON_NEVER
 #define D3D_COMPARISON_LESS D3D11_COMPARISON_LESS
 #define D3D_COMPARISON_EQUAL D3D11_COMPARISON_EQUAL
@@ -147,6 +149,10 @@ typedef ID3D11DeviceContext ID3DDeviceContext;
 #define D3D_FILL_SOLID D3D11_FILL_SOLID
 #define D3D_FILL_WIREFRAME D3D11_FILL_WIREFRAME
 
+#define D3D_FORMAT_SUPPORT D3D11_FORMAT_SUPPORT
+#define D3D_FORMAT_SUPPORT_DEPTH_STENCIL D3D11_FORMAT_SUPPORT_DEPTH_STENCIL
+#define D3D_FORMAT_SUPPORT_DISPLAY D3D11_FORMAT_SUPPORT_DISPLAY
+
 #define D3D_INPUT_PER_VERTEX_DATA D3D11_INPUT_PER_VERTEX_DATA
 
 #define D3D_BIND_INDEX_BUFFER D3D11_BIND_INDEX_BUFFER
@@ -342,6 +348,8 @@ typedef ID3D10Resource ID3DResource;
 #define D3D_CULL_FRONT D3D10_CULL_FRONT
 #define D3D_CULL_BACK D3D10_CULL_BACK
 
+#define D3D_CREATE_DEVICE_DEBUG D3D10_CREATE_DEVICE_DEBUG
+
 #define D3D_COMPARISON_NEVER D3D10_COMPARISON_NEVER
 #define D3D_COMPARISON_LESS D3D10_COMPARISON_LESS
 #define D3D_COMPARISON_EQUAL D3D10_COMPARISON_EQUAL
@@ -401,6 +409,10 @@ typedef ID3D10Resource ID3DResource;
 #define D3D_FILL_SOLID D3D10_FILL_SOLID
 #define D3D_FILL_WIREFRAME D3D10_FILL_WIREFRAME
 
+#define D3D_FORMAT_SUPPORT D3D10_FORMAT_SUPPORT
+#define D3D_FORMAT_SUPPORT_DEPTH_STENCIL D3D10_FORMAT_SUPPORT_DEPTH_STENCIL
+#define D3D_FORMAT_SUPPORT_DISPLAY D3D10_FORMAT_SUPPORT_DISPLAY
+
 #define D3D_INPUT_PER_VERTEX_DATA D3D10_INPUT_PER_VERTEX_DATA
 
 #define D3D_BIND_INDEX_BUFFER D3D10_BIND_INDEX_BUFFER