OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-09 13:22:24 +03:00
Code Activity

0026915: Visualization - return Handle from Graphic3d_CView::FBOCreate() instead of a pointer

Browse Source 
OpenGl_View::FBO() - use copy Handle constructor for compatibility.
This commit is contained in:
kgv
2015-11-23 14:16:08 +03:00
committed by bugmaster
parent 6bd94e0de9
commit b128c89231
14 changed files with 85 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/V3d/V3d_View.cxx
View File

@@ -2940,11 +2940,11 @@ Standard_Boolean V3d_View::ToPixMap (Image_PixMap& theImage,
const V3d_StereoDumpOptions theStereoOptions)
{
// always prefer hardware accelerated offscreen buffer
Graphic3d_PtrFrameBuffer aFBOPtr = NULL;
Graphic3d_PtrFrameBuffer aPrevFBOPtr = myView->FBO();
Handle(Standard_Transient) aFBOPtr;
Handle(Standard_Transient) aPrevFBOPtr = myView->FBO();
Standard_Integer aFBOVPSizeX (theWidth), aFBOVPSizeY (theHeight), aFBOSizeXMax (0), aFBOSizeYMax (0);
Standard_Integer aPrevFBOVPSizeX (0), aPrevFBOVPSizeY (0), aPrevFBOSizeXMax (0), aPrevFBOSizeYMax (0);
if (aPrevFBOPtr != NULL)
if (!aPrevFBOPtr.IsNull())
{
myView->FBOGetDimensions (aPrevFBOPtr,
aPrevFBOVPSizeX, aPrevFBOVPSizeY,
@@ -2956,11 +2956,11 @@ Standard_Boolean V3d_View::ToPixMap (Image_PixMap& theImage,
}
}
if (aFBOPtr == NULL)
if (aFBOPtr.IsNull())
{
// Try to create hardware accelerated buffer
aFBOPtr = myView->FBOCreate (aFBOVPSizeX, aFBOVPSizeY);
if (aFBOPtr != NULL)
if (!aFBOPtr.IsNull())
{
myView->FBOGetDimensions (aFBOPtr,
aFBOVPSizeX, aFBOVPSizeY,
@@ -2975,7 +2975,7 @@ Standard_Boolean V3d_View::ToPixMap (Image_PixMap& theImage,
// If hardware accelerated buffer - try to use onscreen buffer
// Results may be bad!
if (aFBOPtr == NULL)
if (aFBOPtr.IsNull())
{
// retrieve window sizes
Standard_Integer aWinWidth, aWinHeight;
@@ -3065,7 +3065,7 @@ Standard_Boolean V3d_View::ToPixMap (Image_PixMap& theImage,
{
myView->FBORelease (aFBOPtr);
}
else if (aPrevFBOPtr != NULL)
else if (!aPrevFBOPtr.IsNull())
{
myView->FBOChangeViewport (aPrevFBOPtr, aPrevFBOVPSizeX, aPrevFBOVPSizeY);
}