From 74a0d2b5bf4170d210da5a1a12eb0288856bc187 Mon Sep 17 00:00:00 2001 From: asl Date: Fri, 16 Nov 2018 16:07:38 +0300 Subject: [PATCH] patches for compilation --- src/OpenGl/OpenGl_FrameStatsPrs.cxx | 2 +- src/OpenGl/OpenGl_ShaderManager.cxx | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/OpenGl/OpenGl_FrameStatsPrs.cxx b/src/OpenGl/OpenGl_FrameStatsPrs.cxx index b4ddc31932..ccf16edbef 100644 --- a/src/OpenGl/OpenGl_FrameStatsPrs.cxx +++ b/src/OpenGl/OpenGl_FrameStatsPrs.cxx @@ -395,7 +395,7 @@ void OpenGl_FrameStatsPrs::Render (const Handle(OpenGl_Workspace)& theWorkspace) aCtx->ShaderManager()->BindFaceProgram (Handle(OpenGl_TextureSet)(), Graphic3d_TOSM_UNLIT, Graphic3d_AlphaMode_Blend, true, false, - Handle(OpenGl_ShaderProgram)()); + Handle(OpenGl_ShaderProgram)(), Aspect_IS_SOLID); aCtx->SetColor4fv (OpenGl_Vec4 (1.0f, 1.0f, 1.0f, 1.0f)); glEnable (GL_BLEND); glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); diff --git a/src/OpenGl/OpenGl_ShaderManager.cxx b/src/OpenGl/OpenGl_ShaderManager.cxx index 3f595d6925..00a3252de0 100644 --- a/src/OpenGl/OpenGl_ShaderManager.cxx +++ b/src/OpenGl/OpenGl_ShaderManager.cxx @@ -1490,7 +1490,7 @@ Standard_Boolean OpenGl_ShaderManager::prepareStdProgramUnlit (Handle(OpenGl_Sha const Standard_Integer theBits) { Handle(Graphic3d_ShaderProgram) aProgramSrc = new Graphic3d_ShaderProgram(); - TCollection_AsciiString aSrcVert, aSrcVertExtraMain, aSrcVertExtraFunc, aSrcGetAlpha; + TCollection_AsciiString aSrcVert, aSrcVertExtraMain, aSrcVertExtraFunc, aSrcGetAlpha, aSrcVertExtraOut, aSrcFragExtraOut; TCollection_AsciiString aSrcFrag, aSrcFragExtraMain, aSrcFragWriteOit; TCollection_AsciiString aSrcFragGetColor = EOL"vec4 getColor(void) { return occColor; }"; TCollection_AsciiString aSrcFragMainGetColor = EOL" occSetFragColor (getColor());"; @@ -1701,6 +1701,7 @@ Standard_Boolean OpenGl_ShaderManager::prepareStdProgramUnlit (Handle(OpenGl_Sha aSrcVert = aSrcVertExtraFunc + + aSrcVertExtraOut + EOL"void main()" EOL"{" EOL" vec4 vertex = occVertex;" @@ -1712,6 +1713,7 @@ Standard_Boolean OpenGl_ShaderManager::prepareStdProgramUnlit (Handle(OpenGl_Sha aSrcFrag = aSrcFragGetColor + aSrcGetAlpha + + aSrcFragExtraOut + EOL"void main()" EOL"{" + aSrcFragExtraMain -- 2.39.5