diff --git a/src/OpenGl/OpenGl_PrimitiveArray.cxx b/src/OpenGl/OpenGl_PrimitiveArray.cxx index 1461326325..b0dd084a6d 100755 --- a/src/OpenGl/OpenGl_PrimitiveArray.cxx +++ b/src/OpenGl/OpenGl_PrimitiveArray.cxx @@ -1644,7 +1644,7 @@ void OpenGl_PrimitiveArray::DrawDegeneratesAsBBoxs (const TEL_COLOUR* theEdgeCol // ======================================================================= OpenGl_PrimitiveArray::OpenGl_PrimitiveArray (CALL_DEF_PARRAY* thePArray) : myPArray (thePArray), - myDrawMode (GL_NONE) + myDrawMode (DRAW_MODE_NONE) { switch (myPArray->type) { @@ -1714,7 +1714,7 @@ OpenGl_PrimitiveArray::~OpenGl_PrimitiveArray () // ======================================================================= void OpenGl_PrimitiveArray::Render (const Handle(OpenGl_Workspace)& theWorkspace) const { - if (myPArray == NULL || myDrawMode == GL_NONE) + if (myPArray == NULL || myDrawMode == DRAW_MODE_NONE) return; // create VBOs on first render call diff --git a/src/OpenGl/OpenGl_PrimitiveArray.hxx b/src/OpenGl/OpenGl_PrimitiveArray.hxx index 54a1a2675a..7336404132 100644 --- a/src/OpenGl/OpenGl_PrimitiveArray.hxx +++ b/src/OpenGl/OpenGl_PrimitiveArray.hxx @@ -34,6 +34,13 @@ class Handle(OpenGl_Context); class OpenGl_PrimitiveArray : public OpenGl_Element { public: + // OpenGL does not provie a constant for "none" draw mode. + // So we define our own one that does not conflict with GL constants + // and untilizes common GL invalid value + enum + { + DRAW_MODE_NONE = -1 + }; //! Default constructor OpenGl_PrimitiveArray (CALL_DEF_PARRAY* thePArray); @@ -91,7 +98,7 @@ private: protected: mutable CALL_DEF_PARRAY* myPArray; - GLenum myDrawMode; + GLint myDrawMode; public: