xrRender/SH_Atomic.h: rename gs -> sh

OpenXRay · May 27, 2018 · b1acf0b · b1acf0b
1 parent 91d090e
commit b1acf0b
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 17 deletions.
diff --git a/src/Layers/xrRender/R_Backend.h b/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);

diff --git a/src/Layers/xrRender/SH_Atomic.cpp b/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);
 }

diff --git a/src/Layers/xrRender/SH_Atomic.h b/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();

diff --git a/src/Layers/xrRender/r__dsgraph_build.cpp b/src/Layers/xrRender/r__dsgraph_build.cpp
@@ -127,11 +127,11 @@ void D3DXRenderBase::r_dsgraph_insert_dynamic(dxRender_Visual* pVisual, Fvector&
 
 #ifdef USE_OGL
         auto &Nvs = map[pass.vs->vs];
-        auto &Ngs = Nvs[pass.gs->gs];
+        auto &Ngs = Nvs[pass.gs->sh];
         auto &Nps = Ngs[pass.ps->ps];
 #elif defined(USE_DX10) || defined(USE_DX11)
         auto &Nvs = map[&*pass.vs];
-        auto &Ngs = Nvs[pass.gs->gs];
+        auto &Ngs = Nvs[pass.gs->sh];
         auto &Nps = Ngs[pass.ps->ps];
 #else
         auto &Nvs = map[pass.vs->vs];
@@ -274,11 +274,11 @@ void D3DXRenderBase::r_dsgraph_insert_static(dxRender_Visual* pVisual)
 
 #ifdef USE_OGL
         auto &Nvs = map[pass.vs->vs];
-        auto &Ngs = Nvs[pass.gs->gs];
+        auto &Ngs = Nvs[pass.gs->sh];
         auto &Nps = Ngs[pass.ps->ps];
 #elif defined(USE_DX10) || defined(USE_DX11)
         auto &Nvs = map[&*pass.vs];
-        auto &Ngs = Nvs[pass.gs->gs];
+        auto &Ngs = Nvs[pass.gs->sh];
         auto &Nps = Ngs[pass.ps->ps];
 #else
         auto &Nvs = map[pass.vs->vs];

diff --git a/src/Layers/xrRenderDX10/dx10ResourceManager_Resources.cpp b/src/Layers/xrRenderDX10/dx10ResourceManager_Resources.cpp
@@ -370,7 +370,7 @@ SGS* CResourceManager::_CreateGS(LPCSTR name)
         m_gs.insert(std::make_pair(_gs->set_name(name), _gs));
         if (0 == xr_stricmp(name, "null"))
         {
-            _gs->gs = NULL;
+            _gs->sh = NULL;
             return _gs;
         }
 

diff --git a/src/Layers/xrRenderPC_GL/glResourceManager_Resources.cpp b/src/Layers/xrRenderPC_GL/glResourceManager_Resources.cpp
@@ -361,7 +361,7 @@ SGS* CResourceManager::_CreateGS(LPCSTR name)
     m_gs.insert(std::make_pair(_gs->set_name(name), _gs));
     if (0 == xr_stricmp(name, "null"))
     {
-        _gs->gs = NULL;
+        _gs->sh = NULL;
         return _gs;
     }
 
@@ -388,8 +388,8 @@ SGS* CResourceManager::_CreateGS(LPCSTR name)
     R_ASSERT2 ( file, cname );
 
     // Select target
-    _gs->gs = glCreateShader(GL_GEOMETRY_SHADER);
-    void* _result = &_gs->gs;
+    _gs->sh = glCreateShader(GL_GEOMETRY_SHADER);
+    void* _result = &_gs->sh;
     HRESULT const _hr = GEnv.Render->shader_compile(name, (DWORD const*)file->pointer(), file->length(), nullptr,
                                                     nullptr, NULL, _result);
 

diff --git a/src/Layers/xrRenderPC_R3/r3.cpp b/src/Layers/xrRenderPC_R3/r3.cpp
@@ -854,9 +854,9 @@ static HRESULT create_shader(LPCSTR const pTarget, DWORD const* buffer, u32 cons
     {
         SGS* sgs_result = (SGS*)result;
 #ifdef USE_DX11
-        _result = HW.pDevice->CreateGeometryShader(buffer, buffer_size, 0, &sgs_result->gs);
+        _result = HW.pDevice->CreateGeometryShader(buffer, buffer_size, 0, &sgs_result->sh);
 #else // #ifdef USE_DX11
-        _result = HW.pDevice->CreateGeometryShader(buffer, buffer_size, &sgs_result->gs);
+        _result = HW.pDevice->CreateGeometryShader(buffer, buffer_size, &sgs_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
@@ -896,9 +896,9 @@ static HRESULT create_shader(LPCSTR const pTarget, DWORD const* buffer, u32 cons
     {
         SGS* sgs_result = (SGS*)result;
 #ifdef USE_DX11
-        _result = HW.pDevice->CreateGeometryShader(buffer, buffer_size, 0, &sgs_result->gs);
+        _result = HW.pDevice->CreateGeometryShader(buffer, buffer_size, 0, &sgs_result->sh);
 #else // #ifdef USE_DX11
-        _result = HW.pDevice->CreateGeometryShader(buffer, buffer_size, &sgs_result->gs);
+        _result = HW.pDevice->CreateGeometryShader(buffer, buffer_size, &sgs_result->sh);
 #endif // #ifdef USE_DX11
         if (!SUCCEEDED(_result))
         {