From 002b2008b8e2fd290a6cf974450e05e2dcf807af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Garramu=C3=B1o?= Date: Mon, 23 Oct 2023 18:21:27 -0300 Subject: [PATCH] Updated gl viewport with LOG_WARNING instead of LOG_ERROR. --- .gitattributes | 4 ++-- mrv2/lib/mrvGL/mrvGLViewport.cpp | 15 +++++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.gitattributes b/.gitattributes index 08dc0c4eb..8a0884948 100644 --- a/.gitattributes +++ b/.gitattributes @@ -17,6 +17,7 @@ *.ttf -text *.lib -text *.dll -text +*.dylib -text *.mov -text *.mp4 -text *.mpv -text @@ -27,8 +28,7 @@ *.po filter=po *.pot filter=poƧ -windows/win32/include/lib/** linguist-language=C -windows/win64/include/lib/** linguist-language=C +precompiled/windows/win64/include/lib/** linguist-language=C *.bat linguist-language=bat *.cpp linguist-language=C++ diff --git a/mrv2/lib/mrvGL/mrvGLViewport.cpp b/mrv2/lib/mrvGL/mrvGLViewport.cpp index ea02d7519..26188ca95 100644 --- a/mrv2/lib/mrvGL/mrvGLViewport.cpp +++ b/mrv2/lib/mrvGL/mrvGLViewport.cpp @@ -212,13 +212,14 @@ namespace mrv { gl.background = gl::OffscreenBuffer::create( renderSize, offscreenBufferOptions); + CHECK_GL; } } catch (const std::exception& e) { - LOG_ERROR("Creating background: " << e.what()); - gl.buffer.reset(); - gl.stereoBuffer.reset(); + LOG_WARNING("Creating background: " << e.what()); + gl.background.reset(); + valid(0); } try @@ -253,8 +254,9 @@ namespace mrv } catch (const std::exception& e) { - LOG_ERROR("Creating buffer: " << e.what()); + LOG_WARNING("Creating buffer: " << e.what()); gl.buffer.reset(); + valid(0); } if (can_do(FL_STEREO)) @@ -272,8 +274,9 @@ namespace mrv } catch (const std::exception& e) { - LOG_ERROR("Creating stereo buffer: " << e.what()); + LOG_WARNING("Creating stereo buffer: " << e.what()); gl.stereoBuffer.reset(); + valid(0); } } } @@ -382,7 +385,7 @@ namespace mrv glClear(GL_COLOR_BUFFER_BIT | GL_STENCIL_BUFFER_BIT); CHECK_GL; - if (gl.background && !transparent && !p.presentation) + if (gl.background && gl.shader && !transparent && !p.presentation) { math::Matrix4x4f mvp; mvp = _createTexturedRectangle();