#include "glwidget.h"
-#include "debugging/debugging.h"
-
#include "igl.h"
+void (*GLWidget_sharedContextCreated)() = 0;
+
+void (*GLWidget_sharedContextDestroyed)() = 0;
+
+unsigned int g_context_count = 0;
+
+ui::GLArea g_shared{ui::null};
+
+void _glwidget_context_created(ui::GLArea self, void *data)
+{
+ if (++g_context_count == 1) {
+ g_shared = self;
+ g_object_ref(g_shared);
+
+ glwidget_make_current(g_shared);
+ GlobalOpenGL().contextValid = true;
+
+ GLWidget_sharedContextCreated();
+ }
+}
+
+void _glwidget_context_destroyed(ui::GLArea self, void *data)
+{
+ if (--g_context_count == 0) {
+ GlobalOpenGL().contextValid = false;
+
+ GLWidget_sharedContextDestroyed();
+
+ g_shared.unref();
+ g_shared = ui::GLArea(ui::null);
+ }
+}
+
+void glwidget_destroy_context(ui::GLArea self)
+{
+}
+
+void glwidget_create_context(ui::GLArea self)
+{
+}
+
+#if GTK_TARGET == 3
+
#include <gtk/gtk.h>
-#include <gtk/gtkglwidget.h>
-#include "pointer.h"
+GdkGLContext *glwidget_context_created(ui::GLArea self)
+{
+ _glwidget_context_created(self, nullptr);
+ return gtk_gl_area_get_context(self);
+}
+
+ui::GLArea glwidget_new(bool zbuffer)
+{
+ auto self = ui::GLArea(GTK_GL_AREA(gtk_gl_area_new()));
+ gtk_gl_area_set_has_depth_buffer(self, zbuffer);
+ gtk_gl_area_set_auto_render(self, false);
-void ( *GLWidget_sharedContextCreated )() = 0;
-void ( *GLWidget_sharedContextDestroyed )() = 0;
+ self.connect("realize", G_CALLBACK(glwidget_context_created), nullptr);
+ return self;
+}
+bool glwidget_make_current(ui::GLArea self)
+{
+// if (!g_context_count) {
+// glwidget_context_created(self);
+// }
+ gtk_gl_area_make_current(self);
+ auto valid = GlobalOpenGL().contextValid;
+ return true;
+}
-typedef int* attribs_t;
-struct config_t
+void glwidget_swap_buffers(ui::GLArea self)
{
- const char* name;
- attribs_t attribs;
+ gtk_gl_area_queue_render(self);
+}
+
+#endif
+
+#if GTK_TARGET == 2
+
+#include <gtk/gtk.h>
+#include <gtk/gtkglwidget.h>
+
+#include "pointer.h"
+
+struct config_t {
+ const char *name;
+ int *attribs;
};
-typedef const config_t* configs_iterator;
+typedef const config_t *configs_iterator;
int config_rgba32[] = {
- GDK_GL_RGBA,
- GDK_GL_DOUBLEBUFFER,
- GDK_GL_BUFFER_SIZE, 24,
- GDK_GL_ATTRIB_LIST_NONE,
+ GDK_GL_RGBA,
+ GDK_GL_DOUBLEBUFFER,
+ GDK_GL_BUFFER_SIZE, 24,
+ GDK_GL_ATTRIB_LIST_NONE,
};
int config_rgba[] = {
- GDK_GL_RGBA,
- GDK_GL_DOUBLEBUFFER,
- GDK_GL_BUFFER_SIZE, 16,
- GDK_GL_ATTRIB_LIST_NONE,
+ GDK_GL_RGBA,
+ GDK_GL_DOUBLEBUFFER,
+ GDK_GL_BUFFER_SIZE, 16,
+ GDK_GL_ATTRIB_LIST_NONE,
};
const config_t configs[] = {
- {
- "colour-buffer = 32bpp, depth-buffer = none",
- config_rgba32,
- },
- {
- "colour-buffer = 16bpp, depth-buffer = none",
- config_rgba,
- }
+ {
+ "colour-buffer = 32bpp, depth-buffer = none",
+ config_rgba32,
+ },
+ {
+ "colour-buffer = 16bpp, depth-buffer = none",
+ config_rgba,
+ }
};
-GdkGLConfig* glconfig_new(){
- GdkGLConfig* glconfig = 0;
-
- for ( configs_iterator i = configs, end = configs + 2; i != end; ++i )
- {
- glconfig = gdk_gl_config_new( ( *i ).attribs );
- if ( glconfig != 0 ) {
- globalOutputStream() << "OpenGL window configuration: " << ( *i ).name << "\n";
- return glconfig;
- }
- }
-
- globalOutputStream() << "OpenGL window configuration: colour-buffer = auto, depth-buffer = none\n";
- return gdk_gl_config_new_by_mode( (GdkGLConfigMode)( GDK_GL_MODE_RGBA | GDK_GL_MODE_DOUBLE ) );
+GdkGLConfig *glconfig_new()
+{
+ for (configs_iterator i = configs, end = configs + 2; i != end; ++i) {
+ if (auto glconfig = gdk_gl_config_new(i->attribs)) {
+ globalOutputStream() << "OpenGL window configuration: " << i->name << "\n";
+ return glconfig;
+ }
+ }
+ globalOutputStream() << "OpenGL window configuration: colour-buffer = auto, depth-buffer = none\n";
+ return gdk_gl_config_new_by_mode((GdkGLConfigMode) (GDK_GL_MODE_RGBA | GDK_GL_MODE_DOUBLE));
}
int config_rgba32_depth32[] = {
- GDK_GL_RGBA,
- GDK_GL_DOUBLEBUFFER,
- GDK_GL_BUFFER_SIZE, 24,
- GDK_GL_DEPTH_SIZE, 32,
- GDK_GL_ATTRIB_LIST_NONE,
+ GDK_GL_RGBA,
+ GDK_GL_DOUBLEBUFFER,
+ GDK_GL_BUFFER_SIZE,
+ 24,
+ GDK_GL_DEPTH_SIZE,
+ 32,
+ GDK_GL_ATTRIB_LIST_NONE,
};
int config_rgba32_depth24[] = {
- GDK_GL_RGBA,
- GDK_GL_DOUBLEBUFFER,
- GDK_GL_BUFFER_SIZE, 24,
- GDK_GL_DEPTH_SIZE, 24,
- GDK_GL_ATTRIB_LIST_NONE,
+ GDK_GL_RGBA,
+ GDK_GL_DOUBLEBUFFER,
+ GDK_GL_BUFFER_SIZE, 24,
+ GDK_GL_DEPTH_SIZE, 24,
+ GDK_GL_ATTRIB_LIST_NONE,
};
int config_rgba32_depth16[] = {
- GDK_GL_RGBA,
- GDK_GL_DOUBLEBUFFER,
- GDK_GL_BUFFER_SIZE, 24,
- GDK_GL_DEPTH_SIZE, 16,
- GDK_GL_ATTRIB_LIST_NONE,
+ GDK_GL_RGBA,
+ GDK_GL_DOUBLEBUFFER,
+ GDK_GL_BUFFER_SIZE, 24,
+ GDK_GL_DEPTH_SIZE, 16,
+ GDK_GL_ATTRIB_LIST_NONE,
};
int config_rgba32_depth[] = {
- GDK_GL_RGBA,
- GDK_GL_DOUBLEBUFFER,
- GDK_GL_BUFFER_SIZE, 24,
- GDK_GL_DEPTH_SIZE, 1,
- GDK_GL_ATTRIB_LIST_NONE,
+ GDK_GL_RGBA,
+ GDK_GL_DOUBLEBUFFER,
+ GDK_GL_BUFFER_SIZE, 24,
+ GDK_GL_DEPTH_SIZE, 1,
+ GDK_GL_ATTRIB_LIST_NONE,
};
int config_rgba_depth16[] = {
- GDK_GL_RGBA,
- GDK_GL_DOUBLEBUFFER,
- GDK_GL_BUFFER_SIZE, 16,
- GDK_GL_DEPTH_SIZE, 16,
- GDK_GL_ATTRIB_LIST_NONE,
+ GDK_GL_RGBA,
+ GDK_GL_DOUBLEBUFFER,
+ GDK_GL_BUFFER_SIZE, 16,
+ GDK_GL_DEPTH_SIZE, 16,
+ GDK_GL_ATTRIB_LIST_NONE,
};
int config_rgba_depth[] = {
- GDK_GL_RGBA,
- GDK_GL_DOUBLEBUFFER,
- GDK_GL_BUFFER_SIZE, 16,
- GDK_GL_DEPTH_SIZE, 1,
- GDK_GL_ATTRIB_LIST_NONE,
+ GDK_GL_RGBA,
+ GDK_GL_DOUBLEBUFFER,
+ GDK_GL_BUFFER_SIZE, 16,
+ GDK_GL_DEPTH_SIZE, 1,
+ GDK_GL_ATTRIB_LIST_NONE,
};
const config_t configs_with_depth[] =
+ {
+ {
+ "colour-buffer = 32bpp, depth-buffer = 32bpp",
+ config_rgba32_depth32,
+ },
+ {
+ "colour-buffer = 32bpp, depth-buffer = 24bpp",
+ config_rgba32_depth24,
+ },
+ {
+ "colour-buffer = 32bpp, depth-buffer = 16bpp",
+ config_rgba32_depth16,
+ },
+ {
+ "colour-buffer = 32bpp, depth-buffer = auto",
+ config_rgba32_depth,
+ },
+ {
+ "colour-buffer = 16bpp, depth-buffer = 16bpp",
+ config_rgba_depth16,
+ },
+ {
+ "colour-buffer = auto, depth-buffer = auto",
+ config_rgba_depth,
+ },
+ };
+
+GdkGLConfig *glconfig_new_with_depth()
{
- {
- "colour-buffer = 32bpp, depth-buffer = 32bpp",
- config_rgba32_depth32,
- },
- {
- "colour-buffer = 32bpp, depth-buffer = 24bpp",
- config_rgba32_depth24,
- },
- {
- "colour-buffer = 32bpp, depth-buffer = 16bpp",
- config_rgba32_depth16,
- },
- {
- "colour-buffer = 32bpp, depth-buffer = auto",
- config_rgba32_depth,
- },
- {
- "colour-buffer = 16bpp, depth-buffer = 16bpp",
- config_rgba_depth16,
- },
- {
- "colour-buffer = auto, depth-buffer = auto",
- config_rgba_depth,
- },
-};
-
-GdkGLConfig* glconfig_new_with_depth(){
- GdkGLConfig* glconfig = 0;
-
- for ( configs_iterator i = configs_with_depth, end = configs_with_depth + 6; i != end; ++i )
- {
- glconfig = gdk_gl_config_new( ( *i ).attribs );
- if ( glconfig != 0 ) {
- globalOutputStream() << "OpenGL window configuration: " << ( *i ).name << "\n";
- return glconfig;
- }
- }
-
- globalOutputStream() << "OpenGL window configuration: colour-buffer = auto, depth-buffer = auto (fallback)\n";
- return gdk_gl_config_new_by_mode( (GdkGLConfigMode)( GDK_GL_MODE_RGBA | GDK_GL_MODE_DOUBLE | GDK_GL_MODE_DEPTH ) );
+ for (configs_iterator i = configs_with_depth, end = configs_with_depth + 6; i != end; ++i) {
+ if (auto glconfig = gdk_gl_config_new(i->attribs)) {
+ globalOutputStream() << "OpenGL window configuration: " << i->name << "\n";
+ return glconfig;
+ }
+ }
+ globalOutputStream() << "OpenGL window configuration: colour-buffer = auto, depth-buffer = auto (fallback)\n";
+ return gdk_gl_config_new_by_mode((GdkGLConfigMode) (GDK_GL_MODE_RGBA | GDK_GL_MODE_DOUBLE | GDK_GL_MODE_DEPTH));
}
-unsigned int g_context_count = 0;
-
-namespace
+int glwidget_context_created(ui::GLArea self, void *data)
{
- ui::Widget g_shared;
+ _glwidget_context_created(self, data);
+ return false;
}
-gint glwidget_context_created( ui::Widget widget, gpointer data ){
- if ( ++g_context_count == 1 ) {
- g_shared = widget;
- g_object_ref( g_shared );
-
- glwidget_make_current( g_shared );
- GlobalOpenGL().contextValid = true;
-
- GLWidget_sharedContextCreated();
- }
- return FALSE;
-}
-
-gint glwidget_context_destroyed( ui::Widget widget, gpointer data ){
- if ( --g_context_count == 0 ) {
- GlobalOpenGL().contextValid = false;
-
- GLWidget_sharedContextDestroyed();
-
- g_shared.unref();
- g_shared = ui::Widget(nullptr);
- }
- return FALSE;
+int glwidget_context_destroyed(ui::GLArea self, void *data)
+{
+ _glwidget_context_destroyed(self, data);
+ return false;
}
-gboolean glwidget_enable_gl( ui::Widget widget, ui::Widget widget2, gpointer data ){
- if ( !widget2 && !gtk_widget_is_gl_capable( widget ) ) {
- GdkGLConfig* glconfig = ( g_object_get_data( G_OBJECT( widget ), "zbuffer" ) ) ? glconfig_new_with_depth() : glconfig_new();
- ASSERT_MESSAGE( glconfig != 0, "failed to create OpenGL config" );
-
- gtk_widget_set_gl_capability( widget, glconfig, g_shared ? gtk_widget_get_gl_context( g_shared ) : 0, TRUE, GDK_GL_RGBA_TYPE );
-
- gtk_widget_realize( widget );
- if ( !g_shared ) {
- g_shared = widget;
- }
-
- // free glconfig?
- }
- return FALSE;
+bool glwidget_enable_gl(ui::GLArea self, ui::Widget root, gpointer data)
+{
+ if (!root && !gtk_widget_is_gl_capable(self)) {
+ const auto zbuffer = g_object_get_data(G_OBJECT(self), "zbuffer");
+ GdkGLConfig *glconfig = zbuffer ? glconfig_new_with_depth() : glconfig_new();
+ ASSERT_MESSAGE(glconfig, "failed to create OpenGL config");
+
+ const auto share_list = g_shared ? gtk_widget_get_gl_context(g_shared) : nullptr;
+ gtk_widget_set_gl_capability(self, glconfig, share_list, true, GDK_GL_RGBA_TYPE);
+
+ gtk_widget_realize(self);
+ if (!g_shared) {
+ g_shared = self;
+ }
+ // free glconfig?
+ }
+ return false;
}
-ui::Widget glwidget_new( gboolean zbuffer ){
- auto widget = ui::Widget(gtk_drawing_area_new());
-
- g_object_set_data( G_OBJECT( widget ), "zbuffer", gint_to_pointer( zbuffer ) );
+ui::GLArea glwidget_new(bool zbuffer)
+{
+ auto self = ui::GLArea(GTK_DRAWING_AREA(gtk_drawing_area_new()));
- widget.connect( "hierarchy-changed", G_CALLBACK( glwidget_enable_gl ), 0 );
+ g_object_set_data(G_OBJECT(self), "zbuffer", gint_to_pointer(zbuffer));
- widget.connect( "realize", G_CALLBACK( glwidget_context_created ), 0 );
- widget.connect( "unrealize", G_CALLBACK( glwidget_context_destroyed ), 0 );
+ self.connect("hierarchy-changed", G_CALLBACK(glwidget_enable_gl), 0);
- return widget;
-}
+ self.connect("realize", G_CALLBACK(glwidget_context_created), 0);
+ self.connect("unrealize", G_CALLBACK(glwidget_context_destroyed), 0);
-void glwidget_destroy_context( ui::Widget widget ){
+ return self;
}
-void glwidget_create_context( ui::Widget widget ){
+void glwidget_swap_buffers(ui::GLArea self)
+{
+ GdkGLDrawable *gldrawable = gtk_widget_get_gl_drawable(self);
+ gdk_gl_drawable_swap_buffers(gldrawable);
}
-void glwidget_swap_buffers( ui::Widget widget ){
- GdkGLDrawable *gldrawable = gtk_widget_get_gl_drawable( widget );
- gdk_gl_drawable_swap_buffers( gldrawable );
+bool glwidget_make_current(ui::GLArea self)
+{
+ GdkGLContext *glcontext = gtk_widget_get_gl_context(self);
+ GdkGLDrawable *gldrawable = gtk_widget_get_gl_drawable(self);
+ return gdk_gl_drawable_gl_begin(gldrawable, glcontext);
}
-gboolean glwidget_make_current( ui::Widget widget ){
- GdkGLContext *glcontext = gtk_widget_get_gl_context( widget );
- GdkGLDrawable *gldrawable = gtk_widget_get_gl_drawable( widget );
- return gdk_gl_drawable_gl_begin( gldrawable, glcontext );
-}
+#endif
projects / xonotic / netradiant.git / blobdiff