OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-11-01 08:38:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

Integrated new version of the Visualization modules:

Browse Source 
From change List number 20662.
p4#: 20667
This commit is contained in:
Jacob Støren committed 2013-02-28 11:37:32 +01:00
1 parent 1a05676551
commit 5a84a12864
39 files changed
+3071 -264
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

VisualizationModules/LibRender/cvfOpenGL.cpp
+4 -4
View File
@@ -136,7 +136,7 @@ String OpenGL::mapOpenGLErrorToString(cvfGLenum errorCode)
//--------------------------------------------------------------------------------------------------
/// Returns false if no error.
//--------------------------------------------------------------------------------------------------
bool OpenGL::testAndReportOpenGLError(OpenGLContext* oglContext, const char* operation, const char* fileName, int line)
bool OpenGL::testAndReportOpenGLError(OpenGLContext* oglContext, const char* operation, const CodeLocation& codeLocation)
{
// glGetError will end up in an endless loop if no context is current
CVF_ASSERT(oglContext);
@@ -157,7 +157,7 @@ bool OpenGL::testAndReportOpenGLError(OpenGLContext* oglContext, const char* ope
String errCodeStr = mapOpenGLErrorToString(err);
String msg = String("Operation: ") + operation;
msg += "OGL(" + errCodeStr + "): ";
logger->error(msg, fileName, line);
logger->error(msg, codeLocation);
}
err = glGetError();
@@ -170,7 +170,7 @@ bool OpenGL::testAndReportOpenGLError(OpenGLContext* oglContext, const char* ope
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void OpenGL::cvf_check_ogl(OpenGLContext* oglContext, const char* fileName, int line)
void OpenGL::cvf_check_ogl(OpenGLContext* oglContext, const CodeLocation& codeLocation)
{
if (OpenGL::m_enableCheckOgl)
{
@@ -186,7 +186,7 @@ void OpenGL::cvf_check_ogl(OpenGLContext* oglContext, const char* fileName, int
{
String errCodeStr = mapOpenGLErrorToString(err);
String msg = "OGL(" + errCodeStr + "): ";
logger->error(msg, fileName, line);
logger->error(msg, codeLocation);
}
err = glGetError();