xrRender/ShaderResourceTraits.h: renamed shader variables (*s -> sh)

Plus formatting
OpenXRay · May 29, 2018 · b7f5c3c · b7f5c3c
1 parent dd342d4
commit b7f5c3c
Showing 1 changed file with 40 additions and 29 deletions.
diff --git a/src/Layers/xrRender/ShaderResourceTraits.h b/src/Layers/xrRender/ShaderResourceTraits.h
@@ -44,17 +44,19 @@ struct ShaderTypeTraits<SVS>
 
     static inline HWShaderType CreateHWShader(DWORD const* buffer, size_t size)
     {
-        HWShaderType vs = 0;
+        HWShaderType sh = 0;
+
 #ifdef USE_OGL
-        vs = glCreateShader(GL_VERTEX_SHADER);
+        sh = glCreateShader(GL_VERTEX_SHADER);
 #elif defined(USE_DX11)
-        R_CHK(HW.pDevice->CreateVertexShader(buffer, size, 0, &vs));
+        R_CHK(HW.pDevice->CreateVertexShader(buffer, size, 0, &sh));
 #elif defined(USE_DX10)
-        R_CHK(HW.pDevice->CreateVertexShader(buffer, size, &vs));
+        R_CHK(HW.pDevice->CreateVertexShader(buffer, size, &sh));
 #else
-        R_CHK(HW.pDevice->CreateVertexShader(buffer, &vs));
+        R_CHK(HW.pDevice->CreateVertexShader(buffer, &sh));
 #endif
-        return vs;
+
+        return sh;
     }
 
     static inline u32 GetShaderDest() { return RC_dest_vertex; }
@@ -108,17 +110,19 @@ struct ShaderTypeTraits<SPS>
 
     static inline HWShaderType CreateHWShader(DWORD const* buffer, size_t size)
     {
-        HWShaderType ps = 0;
+        HWShaderType sh = 0;
+
 #ifdef USE_OGL
-        ps = glCreateShader(GL_FRAGMENT_SHADER);
+        sh = glCreateShader(GL_FRAGMENT_SHADER);
 #elif defined(USE_DX11)
-        R_CHK(HW.pDevice->CreatePixelShader(buffer, size, 0, &ps));
+        R_CHK(HW.pDevice->CreatePixelShader(buffer, size, 0, &sh));
 #elif defined(USE_DX10)
-        R_CHK(HW.pDevice->CreatePixelShader(buffer, size, &ps));
+        R_CHK(HW.pDevice->CreatePixelShader(buffer, size, &sh));
 #else
-        R_CHK(HW.pDevice->CreatePixelShader(buffer, &ps));
+        R_CHK(HW.pDevice->CreatePixelShader(buffer, &sh));
 #endif
-        return ps;
+
+        return sh;
     }
 
     static inline u32 GetShaderDest() { return RC_dest_pixel; }
@@ -166,15 +170,17 @@ struct ShaderTypeTraits<SGS>
 
     static inline HWShaderType CreateHWShader(DWORD const* buffer, size_t size)
     {
-        HWShaderType gs = 0;
+        HWShaderType sh = 0;
+
 #ifdef USE_OGL
-        gs = glCreateShader(GL_GEOMETRY_SHADER);
+        sh = glCreateShader(GL_GEOMETRY_SHADER);
 #elif defined(USE_DX11)
-        R_CHK(HW.pDevice->CreateGeometryShader(buffer, size, 0, &gs));
+        R_CHK(HW.pDevice->CreateGeometryShader(buffer, size, 0, &sh));
 #else
-        R_CHK(HW.pDevice->CreateGeometryShader(buffer, size, &gs));
+        R_CHK(HW.pDevice->CreateGeometryShader(buffer, size, &sh));
 #endif
-        return gs;
+
+        return sh;
     }
 
     static inline u32 GetShaderDest() { return RC_dest_geometry; }
@@ -204,13 +210,15 @@ struct ShaderTypeTraits<SHS>
 
     static inline HWShaderType CreateHWShader(DWORD const* buffer, size_t size)
     {
-        HWShaderType hs = 0;
+        HWShaderType sh = 0;
+
 #ifdef USE_OGL
-        hs = glCreateShader(GL_TESS_CONTROL_SHADER);
+        sh = glCreateShader(GL_TESS_CONTROL_SHADER);
 #else
-        R_CHK(HW.pDevice->CreateHullShader(buffer, size, NULL, &hs));
+        R_CHK(HW.pDevice->CreateHullShader(buffer, size, NULL, &sh));
 #endif
-        return hs;
+
+        return sh;
     }
 
     static inline u32 GetShaderDest() { return RC_dest_hull; }
@@ -238,13 +246,15 @@ struct ShaderTypeTraits<SDS>
 
     static inline HWShaderType CreateHWShader(DWORD const* buffer, size_t size)
     {
-        HWShaderType hs = 0;
+        HWShaderType sh = 0;
+
 #ifdef USE_OGL
-        hs = glCreateShader(GL_TESS_EVALUATION_SHADER);
+        sh = glCreateShader(GL_TESS_EVALUATION_SHADER);
 #else
-        R_CHK(HW.pDevice->CreateDomainShader(buffer, size, NULL, &hs));
+        R_CHK(HW.pDevice->CreateDomainShader(buffer, size, NULL, &sh));
 #endif
-        return hs;
+
+        return sh;
     }
 
     static inline u32 GetShaderDest() { return RC_dest_domain; }
@@ -272,14 +282,15 @@ struct ShaderTypeTraits<SCS>
 
     static inline HWShaderType CreateHWShader(DWORD const* buffer, size_t size)
     {
-        HWShaderType cs = 0;
+        HWShaderType sh = 0;
 
 #ifdef USE_OGL
-        cs = glCreateShader(GL_COMPUTE_SHADER);
+        sh = glCreateShader(GL_COMPUTE_SHADER);
 #else
-        R_CHK(HW.pDevice->CreateComputeShader(buffer, size, NULL, &cs));
+        R_CHK(HW.pDevice->CreateComputeShader(buffer, size, NULL, &sh));
 #endif
-        return cs;
+
+        return sh;
     }
 
     static inline u32 GetShaderDest() { return RC_dest_compute; }