From a2ac66fe7ba943ad6950ea315d4ab1483ddb98a9 Mon Sep 17 00:00:00 2001 From: ouv Date: Wed, 13 Jun 2012 11:37:25 +0000 Subject: [PATCH] Issue 0001109: External: Dump view regression on Linux --- src/GLViewer/GLViewer_FrameBuffer.cxx | 4 ++-- src/SVTK/SVTK_FrameBuffer.cxx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/GLViewer/GLViewer_FrameBuffer.cxx b/src/GLViewer/GLViewer_FrameBuffer.cxx index 51e7ee9b5..b47bed1bc 100755 --- a/src/GLViewer/GLViewer_FrameBuffer.cxx +++ b/src/GLViewer/GLViewer_FrameBuffer.cxx @@ -89,7 +89,7 @@ static PFNGLDELETERENDERBUFFERSEXTPROC vglDeleteRenderbuffersEXT = NULL; #define GL_GetProcAddress( x ) wglGetProcAddress( (const LPCSTR)x ) #endif -bool InitializeEXT() +bool GLViewer_InitializeEXT() { vglGenFramebuffersEXT = (PFNGLGENFRAMEBUFFERSEXTPROC)GL_GetProcAddress( "glGenFramebuffersEXT" ); vglBindFramebufferEXT = (PFNGLBINDFRAMEBUFFEREXTPROC)GL_GetProcAddress( "glBindFramebufferEXT" ); @@ -125,7 +125,7 @@ GLViewer_FrameBuffer::~GLViewer_FrameBuffer() bool GLViewer_FrameBuffer::init( const GLsizei& xSize, const GLsizei& ySize ) { - myIsInitializeEXT = InitializeEXT(); + myIsInitializeEXT = GLViewer_InitializeEXT(); char* ext = (char*)glGetString( GL_EXTENSIONS ); if( !myIsInitializeEXT || strstr( ext, "GL_EXT_framebuffer_object" ) == NULL ) return false; diff --git a/src/SVTK/SVTK_FrameBuffer.cxx b/src/SVTK/SVTK_FrameBuffer.cxx index b078e5bec..ef06addea 100644 --- a/src/SVTK/SVTK_FrameBuffer.cxx +++ b/src/SVTK/SVTK_FrameBuffer.cxx @@ -91,7 +91,7 @@ static PFNGLDELETERENDERBUFFERSEXTPROC vglDeleteRenderbuffersEXT = NULL; #define GL_GetProcAddress( x ) wglGetProcAddress( (const LPCSTR)x ) #endif -bool InitializeEXT() +bool SVTK_InitializeEXT() { vglGenFramebuffersEXT = (PFNGLGENFRAMEBUFFERSEXTPROC)GL_GetProcAddress( "glGenFramebuffersEXT" ); vglBindFramebufferEXT = (PFNGLBINDFRAMEBUFFEREXTPROC)GL_GetProcAddress( "glBindFramebufferEXT" ); @@ -112,7 +112,7 @@ bool InitializeEXT() return ok; } -static bool IsEXTInitialized = InitializeEXT(); +static bool IsEXTInitialized = SVTK_InitializeEXT(); SVTK_FrameBuffer::SVTK_FrameBuffer() : textureId( 0 ), -- 2.39.2