stuff

Author: igagis

src/ruis/render/opengl/context.cpp

@@ -22,6 +22,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #include "context.hpp"
 
 #include <utki/shared.hpp>
+#include <utki/config.hpp>
 
 #include "shaders/shader_color.hpp"
 #include "shaders/shader_color_pos_lum.hpp"
@@ -56,6 +57,7 @@ using namespace ruis::render::opengl;
 // } // namespace
 
 #ifdef DEBUG
+#	if CFG_OS != CFG_OS_MACOSX
 namespace {
 void GLAPIENTRY opengl_error_callback(
 	GLenum source,
@@ -70,6 +72,7 @@ void GLAPIENTRY opengl_error_callback(
 	std::cout << "OpenGL" << (type == GL_DEBUG_TYPE_ERROR ? " ERROR" : "") << ": " << message << std::endl;
 }
 } // namespace
+#	endif
 #endif
 
 context::context(utki::shared_ref<ruis::render::native_window> native_window) :
@@ -107,16 +110,24 @@ context::context(utki::shared_ref<ruis::render::native_window> native_window) :
 		GLint old_fb;
 		glGetIntegerv(GL_FRAMEBUFFER_BINDING, &old_fb);
 		utki::log_debug([&](auto& o) {
-			o << "old_fb = " << old_fb << std::endl;
+			o << "ruis::render::opengl::context::context(): old_fb = " << old_fb << std::endl;
 		});
 		this->default_framebuffer = GLuint(old_fb);
 
 #ifdef DEBUG
+// glDebugMessageCallback() was introduced in OpenGL 4.3, Macos does not support this version
+#	if CFG_OS != CFG_OS_MACOSX
+		// utki::logcat_debug("ruis::render::opengl::context::context(): enable debug output", '\n');
 		glEnable(GL_DEBUG_OUTPUT);
-		glDebugMessageCallback(opengl_error_callback, nullptr);
+		// utki::logcat_debug("ruis::render::opengl::context::context(): debug output enabled", '\n');
+		glDebugMessageCallback(&opengl_error_callback, nullptr);
+		// utki::logcat_debug("ruis::render::opengl::context::context(): debug message callback set", '\n');
+#	endif
 #endif
 
+		// utki::logcat_debug("ruis::render::opengl::context::context(): enable face culling", '\n');
 		glEnable(GL_CULL_FACE);
+		// utki::logcat_debug("ruis::render::opengl::context::context(): face culling enabled", '\n');
 	});
 }
 

src/ruis/render/opengl/frame_buffer.cpp

@@ -59,7 +59,7 @@ frame_buffer::frame_buffer(
 		assert_opengl_no_error();
 
 		if (this->color) {
-			ASSERT(dynamic_cast<texture_2d*>(this->color.get()))
+			utki::assert(dynamic_cast<texture_2d*>(this->color.get()), SL);
 			// NOLINTNEXTLINE(cppcoreguidelines-pro-type-static-cast-downcast)
 			auto& tex = static_cast<texture_2d&>(*this->color);
 
@@ -70,7 +70,7 @@ frame_buffer::frame_buffer(
 		}
 
 		if (this->depth) {
-			ASSERT(dynamic_cast<texture_depth*>(this->depth.get()))
+			utki::assert(dynamic_cast<texture_depth*>(this->depth.get()), SL);
 			// NOLINTNEXTLINE(cppcoreguidelines-pro-type-static-cast-downcast)
 			auto& tex = static_cast<texture_depth&>(*this->depth);
 

src/ruis/render/opengl/opengl_texture.cpp

@@ -56,7 +56,7 @@ GLint opengl_texture::set_swizzeling(rasterimage::format f) const
 {
 	switch (f) {
 		default:
-			ASSERT(false)
+			utki::assert(false, SL);
 		case rasterimage::format::grey:
 			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_R, GL_RED);
 			assert_opengl_no_error();

src/ruis/render/opengl/texture_2d.cpp

@@ -37,9 +37,9 @@ texture_2d::texture_2d(
 		dims
 	)
 {
-	ASSERT(data.size() % rasterimage::to_num_channels(type) == 0)
-	ASSERT(data.size() % dims.x() == 0)
-	ASSERT(data.size() == 0 || data.size() / rasterimage::to_num_channels(type) / dims.x() == dims.y())
+	utki::assert(data.size() % rasterimage::to_num_channels(type) == 0, SL);
+	utki::assert(data.size() % dims.x() == 0, SL);
+	utki::assert(data.size() == 0 || data.size() / rasterimage::to_num_channels(type) / dims.x() == dims.y(), SL);
 
 	this->bind(0);
 

src/ruis/render/opengl/util.hpp

@@ -34,35 +34,34 @@ inline void assert_opengl_no_error()
 		case GL_NO_ERROR:
 			return;
 		case GL_INVALID_ENUM:
-			ASSERT(false, [](auto& o) {
+			utki::assert(false, [](auto& o) {
 				o << "OpenGL error: GL_INVALID_ENUM";
-			})
+			}, SL);
 			break;
 		case GL_INVALID_VALUE:
-			ASSERT(false, [](auto& o) {
+			utki::assert(false, [](auto& o) {
 				o << "OpenGL error: GL_INVALID_VALUE";
-			})
+			}, SL);
 			break;
 		case GL_INVALID_OPERATION:
-			ASSERT(false, [](auto& o) {
+			utki::assert(false, [](auto& o) {
 				o << "OpenGL error: GL_INVALID_OPERATION";
-			})
+			}, SL);
 			break;
 		case GL_INVALID_FRAMEBUFFER_OPERATION:
-			ASSERT(false, [](auto& o) {
+			utki::assert(false, [](auto& o) {
 				o << "OpenGL error: GL_INVALID_FRAMEBUFFER_OPERATION";
-			})
+			}, SL);
 			break;
 		case GL_OUT_OF_MEMORY:
-			// TODO: throw exception
-			ASSERT(false, [](auto& o) {
+			utki::assert(false, [](auto& o) {
 				o << "OpenGL error: GL_OUT_OF_MEMORY";
-			})
+			}, SL);
 			break;
 		default:
-			ASSERT(false, [&](auto& o) {
+			utki::assert(false, [&](auto& o) {
 				o << "Unknown OpenGL error, code = " << int(error);
-			})
+			}, SL);
 			break;
 	}
 #endif