xrRender/SH_Atomic.h: vertex shader rename (vs->sh)

OpenXRay · May 28, 2018 · e9e25dc · e9e25dc
1 parent 5708cd2
commit e9e25dc
Show file tree

Hide file tree

Showing 13 changed files with 23 additions and 23 deletions.
diff --git a/src/Layers/xrRender/ResourceManager_Resources.cpp b/src/Layers/xrRender/ResourceManager_Resources.cpp
@@ -182,7 +182,7 @@ SVS* CResourceManager::_CreateVS(LPCSTR _name)
         m_vs.insert(std::make_pair(_vs->set_name(name), _vs));
         if (0 == xr_stricmp(_name, "null"))
         {
-            _vs->vs = nullptr;
+            _vs->sh = nullptr;
             return _vs;
         }
 

diff --git a/src/Layers/xrRender/SH_Atomic.cpp b/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
@@ -44,9 +44,9 @@ SVS::~SVS()
 #endif
 
 #ifdef USE_OGL
-    CHK_GL(glDeleteProgram(vs));
+    CHK_GL(glDeleteProgram(sh));
 #else
-    _RELEASE(vs);
+    _RELEASE(sh);
 #endif
 }
 

diff --git a/src/Layers/xrRender/SH_Atomic.h b/src/Layers/xrRender/SH_Atomic.h
@@ -27,9 +27,9 @@ typedef resptr_core<SInputSignature, resptr_base<SInputSignature>> ref_input_sig
 struct ECORE_API SVS : public xr_resource_named
 {
 #ifdef USE_OGL
-    GLuint vs;
+    GLuint sh;
 #else
-    ID3DVertexShader* vs;
+    ID3DVertexShader* sh;
 #endif
     R_constant_table constants;
 #if defined(USE_DX10) || defined(USE_DX11)

diff --git a/src/Layers/xrRender/r__dsgraph_build.cpp b/src/Layers/xrRender/r__dsgraph_build.cpp
@@ -126,15 +126,15 @@ void D3DXRenderBase::r_dsgraph_insert_dynamic(dxRender_Visual* pVisual, Fvector&
         auto &map = mapMatrixPasses[sh->flags.iPriority / 2][iPass];
 
 #ifdef USE_OGL
-        auto &Nvs = map[pass.vs->vs];
+        auto &Nvs = map[pass.vs->sh];
         auto &Ngs = Nvs[pass.gs->sh];
         auto &Nps = Ngs[pass.ps->sh];
 #elif defined(USE_DX10) || defined(USE_DX11)
         auto &Nvs = map[&*pass.vs];
         auto &Ngs = Nvs[pass.gs->sh];
         auto &Nps = Ngs[pass.ps->sh];
 #else
-        auto &Nvs = map[pass.vs->vs];
+        auto &Nvs = map[pass.vs->sh];
         auto &Nps = Nvs[pass.ps->sh];
 #endif
 
@@ -273,15 +273,15 @@ void D3DXRenderBase::r_dsgraph_insert_static(dxRender_Visual* pVisual)
         auto &map = mapNormalPasses[sh->flags.iPriority / 2][iPass];
 
 #ifdef USE_OGL
-        auto &Nvs = map[pass.vs->vs];
+        auto &Nvs = map[pass.vs->sh];
         auto &Ngs = Nvs[pass.gs->sh];
         auto &Nps = Ngs[pass.ps->sh];
 #elif defined(USE_DX10) || defined(USE_DX11)
         auto &Nvs = map[&*pass.vs];
         auto &Ngs = Nvs[pass.gs->sh];
         auto &Nps = Ngs[pass.ps->sh];
 #else
-        auto &Nvs = map[pass.vs->vs];
+        auto &Nvs = map[pass.vs->sh];
         auto &Nps = Nvs[pass.ps->sh];
 #endif
 

diff --git a/src/Layers/xrRenderDX10/dx10R_Backend_Runtime.h b/src/Layers/xrRenderDX10/dx10R_Backend_Runtime.h
@@ -484,13 +484,13 @@ IC void CBackend::ApplyVertexLayout()
 ICF void CBackend::set_VS(ref_vs& _vs)
 {
     m_pInputSignature = _vs->signature->signature;
-    set_VS(_vs->vs, _vs->cName.c_str());
+    set_VS(_vs->sh, _vs->cName.c_str());
 }
 
 ICF void CBackend::set_VS(SVS* _vs)
 {
     m_pInputSignature = _vs->signature->signature;
-    set_VS(_vs->vs, _vs->cName.c_str());
+    set_VS(_vs->sh, _vs->cName.c_str());
 }
 
 IC bool CBackend::CBuffersNeedUpdate(

diff --git a/src/Layers/xrRenderDX10/dx10ResourceManager_Resources.cpp b/src/Layers/xrRenderDX10/dx10ResourceManager_Resources.cpp
@@ -143,7 +143,7 @@ SVS* CResourceManager::_CreateVS(LPCSTR _name)
         SVS* _vs = new SVS();
         _vs->dwFlags |= xr_resource_flagged::RF_REGISTERED;
         m_vs.insert(std::make_pair(_vs->set_name(name), _vs));
-        //_vs->vs				= NULL;
+        //_vs->sh				= NULL;
         //_vs->signature		= NULL;
         if (0 == xr_stricmp(_name, "null"))
         {

diff --git a/src/Layers/xrRenderDX9/dx9R_Backend_Runtime.h b/src/Layers/xrRenderDX9/dx9R_Backend_Runtime.h
@@ -243,7 +243,7 @@ ICF void CBackend::set_CullMode(u32 _mode)
     }
 }
 
-ICF void CBackend::set_VS(ref_vs& _vs) { set_VS(_vs->vs, _vs->cName.c_str()); }
+ICF void CBackend::set_VS(ref_vs& _vs) { set_VS(_vs->sh, _vs->cName.c_str()); }
 IC void CBackend::set_Constants(R_constant_table* C)
 {
     // caching

diff --git a/src/Layers/xrRenderGL/glR_Backend_Runtime.h b/src/Layers/xrRenderGL/glR_Backend_Runtime.h
@@ -322,7 +322,7 @@ ICF void CBackend::set_CullMode(u32 _mode)
 
 ICF void CBackend::set_VS(ref_vs& _vs)
 {
-    set_VS(_vs->vs, _vs->cName.c_str());
+    set_VS(_vs->sh, _vs->cName.c_str());
 }
 
 IC void CBackend::set_Constants(R_constant_table* C)

diff --git a/src/Layers/xrRenderPC_GL/glResourceManager_Resources.cpp b/src/Layers/xrRenderPC_GL/glResourceManager_Resources.cpp
@@ -215,8 +215,8 @@ SVS* CResourceManager::_CreateVS(LPCSTR _name)
     FS.r_close(file);
 
     // Select target
-    _vs->vs = glCreateShader(GL_VERTEX_SHADER);
-    void* _result = &_vs->vs;
+    _vs->sh = glCreateShader(GL_VERTEX_SHADER);
+    void* _result = &_vs->sh;
     HRESULT const _hr = GEnv.Render->shader_compile(name, (DWORD const*)data, size, nullptr, nullptr, NULL, _result);
 
     VERIFY(SUCCEEDED(_hr));

diff --git a/src/Layers/xrRenderPC_R1/FStaticRender.cpp b/src/Layers/xrRenderPC_R1/FStaticRender.cpp
@@ -783,7 +783,7 @@ static HRESULT create_shader(LPCSTR const pTarget, DWORD const* buffer, u32 cons
     else if (pTarget[0] == 'v')
     {
         SVS* svs_result = (SVS*)result;
-        _result = HW.pDevice->CreateVertexShader(buffer, &svs_result->vs);
+        _result = HW.pDevice->CreateVertexShader(buffer, &svs_result->sh);
         if (!SUCCEEDED(_result))
         {
             Log("! VS: ", file_name);

diff --git a/src/Layers/xrRenderPC_R2/r2.cpp b/src/Layers/xrRenderPC_R2/r2.cpp
@@ -658,7 +658,7 @@ static HRESULT create_shader(LPCSTR const pTarget, DWORD const* buffer, u32 cons
     else if (pTarget[0] == 'v')
     {
         SVS* svs_result = (SVS*)result;
-        _result = HW.pDevice->CreateVertexShader(buffer, &svs_result->vs);
+        _result = HW.pDevice->CreateVertexShader(buffer, &svs_result->sh);
         if (!SUCCEEDED(_result))
         {
             Log("! VS: ", file_name);

diff --git a/src/Layers/xrRenderPC_R3/r3.cpp b/src/Layers/xrRenderPC_R3/r3.cpp
@@ -802,9 +802,9 @@ static HRESULT create_shader(LPCSTR const pTarget, DWORD const* buffer, u32 cons
     {
         SVS* svs_result = (SVS*)result;
 #ifdef USE_DX11
-        _result = HW.pDevice->CreateVertexShader(buffer, buffer_size, 0, &svs_result->vs);
+        _result = HW.pDevice->CreateVertexShader(buffer, buffer_size, 0, &svs_result->sh);
 #else // #ifdef USE_DX11
-        _result = HW.pDevice->CreateVertexShader(buffer, buffer_size, &svs_result->vs);
+        _result = HW.pDevice->CreateVertexShader(buffer, buffer_size, &svs_result->sh);
 #endif // #ifdef USE_DX11
 
         if (!SUCCEEDED(_result))

diff --git a/src/Layers/xrRenderPC_R4/r4.cpp b/src/Layers/xrRenderPC_R4/r4.cpp
@@ -819,9 +819,9 @@ static HRESULT create_shader(LPCSTR const pTarget, DWORD const* buffer, u32 cons
     {
         SVS* svs_result = (SVS*)result;
 #ifdef USE_DX11
-        _result = HW.pDevice->CreateVertexShader(buffer, buffer_size, 0, &svs_result->vs);
+        _result = HW.pDevice->CreateVertexShader(buffer, buffer_size, 0, &svs_result->sh);
 #else // #ifdef USE_DX11
-        _result = HW.pDevice->CreateVertexShader(buffer, buffer_size, &svs_result->vs);
+        _result = HW.pDevice->CreateVertexShader(buffer, buffer_size, &svs_result->sh);
 #endif // #ifdef USE_DX11
 
         if (!SUCCEEDED(_result))