From: Niklas P Andersson Date: Mon, 14 Dec 2015 15:33:54 +0000 (+0100) Subject: Revert "* OpenGL debug logging" X-Git-Tag: 2.1.0_Beta1~139 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=fa19a89ee9fd06cad3b6d8f209b37cb2a644910d;p=casparcg Revert "* OpenGL debug logging" This reverts commit 93ab04423a54d305412f84ef367849721896f730. --- diff --git a/accelerator/ogl/util/device.cpp b/accelerator/ogl/util/device.cpp index f8627081b..e71ca3404 100644 --- a/accelerator/ogl/util/device.cpp +++ b/accelerator/ogl/util/device.cpp @@ -55,12 +55,7 @@ #include namespace caspar { namespace accelerator { namespace ogl { - - void __stdcall gl_debug_callback(GLenum, GLenum, GLuint, GLenum, GLsizei, const GLchar* message, const void*) { - CASPAR_LOG(debug) << message; - } - - + struct device::impl : public std::enable_shared_from_this { static_assert(std::is_same().impl_), spl::shared_ptr>::value, "impl_ must be shared_ptr"); @@ -90,15 +85,10 @@ struct device::impl : public std::enable_shared_from_this if (glewInit() != GLEW_OK) CASPAR_THROW_EXCEPTION(gl::ogl_exception() << msg_info("Failed to initialize GLEW.")); - + if(!GLEW_VERSION_3_0) CASPAR_THROW_EXCEPTION(not_supported() << msg_info("Your graphics card does not meet the minimum hardware requirements since it does not support OpenGL 3.0 or higher.")); - - glDebugMessageCallbackARB(gl_debug_callback, nullptr); - //glDebugMessageControlARB(GL_DONT_CARE, GL_DONT_CARE, GL_DEBUG_SEVERITY_NOTIFICATION, 0, nullptr, GL_FALSE); - glDebugMessageControlARB(GL_DONT_CARE, GL_DEBUG_TYPE_PERFORMANCE, GL_DEBUG_SEVERITY_LOW, 0, nullptr, GL_FALSE); - glDebugMessageControlARB(GL_DONT_CARE, GL_DEBUG_TYPE_PERFORMANCE, GL_DEBUG_SEVERITY_MEDIUM, 0, nullptr, GL_FALSE); - + glGenFramebuffers(1, &fbo_); glBindFramebuffer(GL_FRAMEBUFFER, fbo_); });