OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-09-03 14:10:33 +03:00
Code Activity

0023226: Extend OpenGl_Context to store map of shared GPU resources

Browse Source 
OpenGl_Resource was slightly corrected and OpenGl_Element was extended
with Release method to manage GPU resources.

OpenGl_PrimitiveArray now uses new OpenGl_VertexBuffer class (requires OpenGL 1.5+).
Strange workarounds for feedback mode were removed.

OpenGl_Context now provides access to shared GPU resources
and manages resources queue for delayed release
(replaces functionality of removed OpenGl_ResourceCleaner).
Loaded GL_ARB_texture_buffer_object and GL_ARB_draw_instanced extensions.

Global maps of views, workspaces and structures
were moved to OpenGl_GraphicDriver members.
UserDrawCallback() function moved to OpenGl_GraphicDriver methods.

Aspect_GraphicCallbackStruct now holds handle of OpenGl_Context
instead of system-dependent pointers to GL context definition.

New classes NCollection_Vec2, NCollection_Vec3 and NCollection_Vec4
implements interface to low-level data (points, vertices, colors) in GLSL-style.
Removed EnableVBO argument from vdrawparray Draw Harness command
Corrected compilation errors
Fixed wrong argument in Index VBO initialization
Fixed several cases of incorrect memory management in TKV3d

Visual3d_ViewManager::Remove()
Destroy structures before last view removed for correct GPU resources management.

Graphic3d_Structure::GraphicClear()
Remove groups to avoid usage of dead OpenGl_Group pointers.

V3d_View::Remove()
Fixed mistake in #0000280 patch.
Small correction
Fixed OCC280 test command

Replace removed view within created one in ViewerTest EventManager.
ViewerTest, do not create unused 3D view

In current design NIS_View always created and used for both - NIS objects and AIS objects.
This commit is contained in:
kgv
2012-07-13 15:51:16 +04:00
parent 400933675f
commit 5e27df788d
74 changed files with 3005 additions and 1593 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/OpenGl/OpenGl_AspectText.hxx
View File

@@ -30,10 +30,11 @@
class OpenGl_AspectText : public OpenGl_Element
{
public:
OpenGl_AspectText ();
virtual ~OpenGl_AspectText ();
public:
OpenGl_AspectText();
virtual ~OpenGl_AspectText();
void SetContext (const CALL_DEF_CONTEXTTEXT &AContext);
@@ -46,12 +47,15 @@ class OpenGl_AspectText : public OpenGl_Element
Aspect_TypeOfDisplayText DisplayType() const { return myDisplayType; }
const TEL_COLOUR & SubtitleColor() const { return mySubtitleColor; }
virtual void Render (const Handle(OpenGl_Workspace) &AWorkspace) const;
virtual void Render (const Handle(OpenGl_Workspace)& theWorkspace) const;
virtual void Release (const Handle(OpenGl_Context)& theContext);
protected:
protected:
void SetFontName (const char *AFont);
protected:
int myZoomable;
float myAngle;
OSD_FontAspect myFontAspect;
@@ -63,8 +67,10 @@ class OpenGl_AspectText : public OpenGl_Element
Aspect_TypeOfDisplayText myDisplayType;
TEL_COLOUR mySubtitleColor;
public:
public:
DEFINE_STANDARD_ALLOC
};
#endif //OpenGl_AspectText_Header