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

Author: q4a

src/Layers/xrRender/R_Backend.h

@@ -314,7 +314,7 @@ class ECORE_API CBackend
 #else
     ICF void set_PS(ID3DPixelShader* _ps, LPCSTR _n = nullptr);
 #endif // USE_OGL
-    ICF void set_PS(ref_ps& _ps) { set_PS(_ps->ps, _ps->cName.c_str()); }
+    ICF void set_PS(ref_ps& _ps) { set_PS(_ps->sh, _ps->cName.c_str()); }
 
 #if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
 #ifdef USE_OGL

src/Layers/xrRender/ResourceManager.h

@@ -40,8 +40,9 @@ class ECORE_API CResourceManager
 
 #if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
     using map_GS = xr_map<const char*, SGS*, str_pred>;
-#endif //	USE_DX10
-#ifdef USE_DX11
+#endif
+
+#if defined(USE_DX11)
     using map_HS = xr_map<const char*, SHS*, str_pred>;
     using map_DS = xr_map<const char*, SDS*, str_pred>;
     using map_CS = xr_map<const char*, SCS*, str_pred>;
@@ -163,7 +164,7 @@ class ECORE_API CResourceManager
     void _DeleteGS(const SGS* GS);
 #endif //	USE_DX10
 
-#ifdef USE_DX11
+#if defined(USE_DX11)
     SHS* _CreateHS(LPCSTR Name);
     void _DeleteHS(const SHS* HS);
 
@@ -172,7 +173,7 @@ class ECORE_API CResourceManager
 
     SCS* _CreateCS(LPCSTR Name);
     void _DeleteCS(const SCS* CS);
-#endif //	USE_DX10
+#endif
 
     SPS* _CreatePS(LPCSTR Name);
     void _DeletePS(const SPS* PS);
@@ -189,7 +190,8 @@ class ECORE_API CResourceManager
 
 #ifdef USE_OGL
     SDeclaration* _CreateDecl (u32 FVF);
-#endif // USE_OGL
+#endif
+
     SDeclaration* _CreateDecl(D3DVERTEXELEMENT9* dcl);
     void _DeleteDecl(const SDeclaration* dcl);
 
@@ -237,7 +239,8 @@ class ECORE_API CResourceManager
 #else
     SGeometry* CreateGeom(D3DVERTEXELEMENT9* decl, ID3DVertexBuffer* vb, ID3DIndexBuffer* ib);
     SGeometry* CreateGeom(u32 FVF, ID3DVertexBuffer* vb, ID3DIndexBuffer* ib);
-#endif // USE_OGL
+#endif
+
     void DeleteGeom(const SGeometry* VS);
     void DeferredLoad(BOOL E) { bDeferredLoad = E; }
     void DeferredUpload();
@@ -248,16 +251,14 @@ class ECORE_API CResourceManager
     void Dump(bool bBrief);
 
 private:
-#if defined(USE_DX10) || defined(USE_DX11)
     template <typename T>
     T& GetShaderMap();
 
     template <typename T>
-    T* CreateShader(const char* name);
+    T* CreateShader(const char* name, const bool searchForEntryAndTarget = false);
 
     template <typename T>
     void DestroyShader(const T* sh);
-#endif
 };
 
 #endif // ResourceManagerH

src/Layers/xrRender/ResourceManager_Resources.cpp

@@ -14,6 +14,7 @@
 #include "tss.h"
 #include "blenders/blender.h"
 #include "blenders/blender_recorder.h"
+#include "ShaderResourceTraits.h"
 
 void fix_texture_name(LPSTR fn);
 
@@ -156,7 +157,6 @@ void CResourceManager::_DeleteDecl(const SDeclaration* dcl)
 }
 
 //--------------------------------------------------------------------------------------------------------------
-#ifndef _EDITOR
 SVS* CResourceManager::_CreateVS(LPCSTR _name)
 {
     string_path name;
@@ -171,179 +171,14 @@ SVS* CResourceManager::_CreateVS(LPCSTR _name)
         xr_strcat(name, "_3");
     if (4 == GEnv.Render->m_skinning)
         xr_strcat(name, "_4");
-    LPSTR N = LPSTR(name);
-    map_VS::iterator I = m_vs.find(N);
-    if (I != m_vs.end())
-        return I->second;
-    else
-    {
-        SVS* _vs = new SVS();
-        _vs->dwFlags |= xr_resource_flagged::RF_REGISTERED;
-        m_vs.insert(std::make_pair(_vs->set_name(name), _vs));
-        if (0 == xr_stricmp(_name, "null"))
-        {
-            _vs->vs = nullptr;
-            return _vs;
-        }
-
-        string_path cname;
-        strconcat(sizeof(cname), cname, GEnv.Render->getShaderPath(), _name, ".vs");
-        FS.update_path(cname, "$game_shaders$", cname);
-        //		LPCSTR						target		= NULL;
-
-        IReader* fs = FS.r_open(cname);
-        R_ASSERT3(fs, "shader file doesnt exist", cname);
-
-        // Select target
-        LPCSTR c_target = "vs_2_0";
-        LPCSTR c_entry = "main";
-        if (HW.Caps.geometry_major >= 2)
-            c_target = "vs_2_0";
-        else
-            c_target = "vs_1_1";
-
-        // duplicate and zero-terminate
-        IReader* file = FS.r_open(cname);
-        R_ASSERT2(file, cname);
-        u32 const size = file->length();
-        char* const data = (LPSTR)_alloca(size + 1);
-        CopyMemory(data, file->pointer(), size);
-        data[size] = 0;
-        FS.r_close(file);
-
-        if (strstr(data, "main_vs_1_1"))
-        {
-            c_target = "vs_1_1";
-            c_entry = "main_vs_1_1";
-        }
-        if (strstr(data, "main_vs_2_0"))
-        {
-            c_target = "vs_2_0";
-            c_entry = "main_vs_2_0";
-        }
-
-        Msg("compiling shader %s", name);
-        HRESULT const _hr = GEnv.Render->shader_compile(name, (DWORD const*)data, size, c_entry, c_target,
-            D3DXSHADER_DEBUG | D3DXSHADER_PACKMATRIX_ROWMAJOR, (void*&)_vs);
-
-        if (FAILED(_hr))
-        {
-            FlushLog();
-        }
-
-        CHECK_OR_EXIT(!FAILED(_hr), "Your video card doesn't meet game requirements.\n\nTry to lower game settings.");
-
-        return _vs;
-    }
+    
+    return CreateShader<SVS>(name, true);
 }
-#endif
-
-void CResourceManager::_DeleteVS(const SVS* vs)
-{
-    if (0 == (vs->dwFlags & xr_resource_flagged::RF_REGISTERED))
-        return;
-    LPSTR N = LPSTR(*vs->cName);
-    map_VS::iterator I = m_vs.find(N);
-    if (I != m_vs.end())
-    {
-        m_vs.erase(I);
-        return;
-    }
-    Msg("! ERROR: Failed to find compiled vertex-shader '%s'", *vs->cName);
-}
-
-#ifndef _EDITOR
-//--------------------------------------------------------------------------------------------------------------
-SPS* CResourceManager::_CreatePS(LPCSTR name)
-{
-    LPSTR N = LPSTR(name);
-    map_PS::iterator I = m_ps.find(N);
-    if (I != m_ps.end())
-        return I->second;
-    else
-    {
-        SPS* _ps = new SPS();
-        _ps->dwFlags |= xr_resource_flagged::RF_REGISTERED;
-        m_ps.insert(std::make_pair(_ps->set_name(name), _ps));
-        if (0 == xr_stricmp(name, "null"))
-        {
-            _ps->ps = nullptr;
-            return _ps;
-        }
-
-        // Open file
-        string_path cname;
-        LPCSTR shader_path = GEnv.Render->getShaderPath();
-        strconcat(sizeof(cname), cname, shader_path, name, ".ps");
-        FS.update_path(cname, "$game_shaders$", cname);
 
-        // duplicate and zero-terminate
-        IReader* file = FS.r_open(cname);
-        R_ASSERT2(file, cname);
-        u32 const size = file->length();
-        char* const data = (LPSTR)_alloca(size + 1);
-        CopyMemory(data, file->pointer(), size);
-        data[size] = 0;
-        FS.r_close(file);
+void CResourceManager::_DeleteVS(const SVS* vs) { DestroyShader(vs); }
 
-        // Select target
-        LPCSTR c_target = "ps_2_0";
-        LPCSTR c_entry = "main";
-        if (strstr(data, "main_ps_1_1"))
-        {
-            c_target = "ps_1_1";
-            c_entry = "main_ps_1_1";
-        }
-        if (strstr(data, "main_ps_1_2"))
-        {
-            c_target = "ps_1_2";
-            c_entry = "main_ps_1_2";
-        }
-        if (strstr(data, "main_ps_1_3"))
-        {
-            c_target = "ps_1_3";
-            c_entry = "main_ps_1_3";
-        }
-        if (strstr(data, "main_ps_1_4"))
-        {
-            c_target = "ps_1_4";
-            c_entry = "main_ps_1_4";
-        }
-        if (strstr(data, "main_ps_2_0"))
-        {
-            c_target = "ps_2_0";
-            c_entry = "main_ps_2_0";
-        }
-
-        Msg("compiling shader %s", name);
-        HRESULT const _hr = GEnv.Render->shader_compile(name, (DWORD const*)data, size, c_entry, c_target,
-            D3DXSHADER_DEBUG | D3DXSHADER_PACKMATRIX_ROWMAJOR, (void*&)_ps);
-
-        if (FAILED(_hr))
-        {
-            FlushLog();
-        }
-
-        CHECK_OR_EXIT(!FAILED(_hr), "Your video card doesn't meet game requirements.\n\nTry to lower game settings.");
-
-        return _ps;
-    }
-}
-#endif
-
-void CResourceManager::_DeletePS(const SPS* ps)
-{
-    if (0 == (ps->dwFlags & xr_resource_flagged::RF_REGISTERED))
-        return;
-    LPSTR N = LPSTR(*ps->cName);
-    map_PS::iterator I = m_ps.find(N);
-    if (I != m_ps.end())
-    {
-        m_ps.erase(I);
-        return;
-    }
-    Msg("! ERROR: Failed to find compiled pixel-shader '%s'", *ps->cName);
-}
+SPS* CResourceManager::_CreatePS(LPCSTR name) { return CreateShader<SPS>(name, true); }
+void CResourceManager::_DeletePS(const SPS* ps) { DestroyShader(ps); }
 
 R_constant_table* CResourceManager::_CreateConstantTable(R_constant_table& C)
 {

src/Layers/xrRender/SH_Atomic.cpp

@@ -28,7 +28,7 @@
 
 ///////////////////////////////////////////////////////////////////////
 //  SVS
-SVS::SVS() : vs(0)
+SVS::SVS() : sh(0)
 #if defined(USE_DX10) || defined(USE_DX11)
 //  ,signature(0)
 #endif // USE_DX10
@@ -37,26 +37,29 @@ SVS::SVS() : vs(0)
 SVS::~SVS()
 {
     RImplementation.Resources->_DeleteVS(this);
+
 #if defined(USE_DX10) || defined(USE_DX11)
     //_RELEASE(signature);
     //	Now it is release automatically
-#endif //USE_DX10
+#endif
+
 #ifdef USE_OGL
-    CHK_GL(glDeleteProgram(vs));
+    CHK_GL(glDeleteProgram(sh));
 #else
-    _RELEASE(vs);
-#endif // USE_OGL
+    _RELEASE(sh);
+#endif
 }
 
 ///////////////////////////////////////////////////////////////////////
 // SPS
 SPS::~SPS()
 {
 #ifdef USE_OGL
-    CHK_GL(glDeleteProgram(ps));
+    CHK_GL(glDeleteProgram(sh));
 #else
-    _RELEASE(ps);
-#endif // USE_OGL
+    _RELEASE(sh);
+#endif
+    
     RImplementation.Resources->_DeletePS(this);
 }
 
@@ -69,26 +72,42 @@ SGS::~SGS()
     CHK_GL(glDeleteProgram(sh));
 #else
     _RELEASE(sh);
-#endif // USE_OGL
+#endif
+
     RImplementation.Resources->_DeleteGS(this);
 }
 
-#ifdef USE_DX11
+#if defined(USE_DX11)
 SHS::~SHS()
 {
+#ifdef USE_OGL
+    CHK_GL(glDeleteProgram(sh));
+#else
     _RELEASE(sh);
+#endif
+
     RImplementation.Resources->_DeleteHS(this);
 }
 
 SDS::~SDS()
 {
+#ifdef USE_OGL
+    CHK_GL(glDeleteProgram(sh));
+#else
     _RELEASE(sh);
+#endif
+
     RImplementation.Resources->_DeleteDS(this);
 }
 
 SCS::~SCS()
 {
+#ifdef USE_OGL
+    CHK_GL(glDeleteProgram(sh));
+#else
     _RELEASE(sh);
+#endif
+
     RImplementation.Resources->_DeleteCS(this);
 }
 #endif