glR_Backend_Runtime: Enable geometry shaders.

OpenXRay · Nov 25, 2015 · 3e48415 · 3e48415
1 parent 009378b
commit 3e48415
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/src/Layers/xrRender/R_Backend.h b/src/Layers/xrRender/R_Backend.h
@@ -124,6 +124,7 @@ class ECORE_API CBackend
  SState* state;
  GLuint ps;
  GLuint vs;
+ GLuint gs;
 #else
  ID3DState* state;
  ID3DPixelShader* ps;
@@ -141,7 +142,7 @@ class ECORE_API CBackend
 #ifdef DEBUG
  LPCSTR ps_name;
  LPCSTR vs_name;
-#if defined(USE_DX10) || defined(USE_DX11)
+#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
  LPCSTR gs_name;
 # ifdef USE_DX11
  LPCSTR hs_name;

diff --git a/src/Layers/xrRenderGL/glR_Backend_Runtime.h b/src/Layers/xrRenderGL/glR_Backend_Runtime.h
@@ -65,6 +65,23 @@ ICF void CBackend::set_PS(GLuint _ps, LPCSTR _n)
  }
 }
 
+ICF void CBackend::set_GS(GLuint _gs, LPCSTR _n)
+{
+ if (gs != _gs)
+ {
+ string_path name;
+ PGO(glGetObjectLabel(GL_PROGRAM, _ps, sizeof(name), nullptr, name));
+ PGO(Msg("PGO:Gshader:%d,%s", _ps, _n ? _n : name));
+ // TODO: OGL: Get statistics for G Shader change
+ //stat.gs ++;
+ gs = _gs;
+ CHK_GL(glUseProgramStages(HW.pPP, GL_GEOMETRY_SHADER_BIT, gs));
+#ifdef DEBUG
+ gs_name = _n;
+#endif
+ }
+}
+
 ICF void CBackend::set_VS(GLuint _vs, LPCSTR _n)
 {
  if (vs != _vs)