X-Git-Url: http://pileus.org/git/?p=grits;a=blobdiff_plain;f=src%2Fgtkgl.c;h=19f3219043273e18f82be3b976acf83d911b80ae;hp=bb8749403e63ca72bee0dfb5a6356be9a4fc6f75;hb=5c17e7d79895982036139dcffb5c17cefb1d4d9f;hpb=76547a2ce3597d4d6e99d8057503be1ab957dad6

diff --git a/src/gtkgl.c b/src/gtkgl.c
index bb87494..19f3219 100644
--- a/src/gtkgl.c
+++ b/src/gtkgl.c
@@ -56,6 +56,26 @@ void gtk_gl_disable(GtkWidget *widget)
 #elif defined(SYS_X11)
 #include <GL/glx.h>
 #include <gdk/gdkx.h>
+static gboolean gtk_gl_errors;
+static int gtk_gl_handler(Display *xdisplay, XErrorEvent *xerror)
+{
+	gtk_gl_errors = TRUE;
+	return 0;
+}
+static GLXContext gtk_gl_create_context(Display *xdisplay, XVisualInfo *xvinfo,
+		GLXContext shared, Bool direct)
+{
+	gtk_gl_errors = FALSE;
+	XSync(xdisplay, False);
+	void *handler = XSetErrorHandler(gtk_gl_handler);
+	GLXContext context = glXCreateContext(xdisplay, xvinfo, shared, direct);
+	XSync(xdisplay, False);
+	XSetErrorHandler(handler);
+
+	if (gtk_gl_errors)
+		return 0;
+	return context;
+}
 void gtk_gl_enable(GtkWidget *widget)
 {
 	g_debug("GtkGl: enable");
@@ -72,16 +92,33 @@ void gtk_gl_enable(GtkWidget *widget)
 	                 GLX_DOUBLEBUFFER,
 	                 GLX_DEPTH_SIZE,  1,
 	                 None};
+
 	XVisualInfo *xvinfo  = glXChooseVisual(xdisplay, nscreen, attribs);
 	if (!xvinfo)
 		g_error("GtkGl: enable - unable to get valid OpenGL Visual");
-	GLXContext   context = glXCreateContext(xdisplay, xvinfo, NULL, False);
+	GLXContext context = 0;
+	if (!context)
+		context = gtk_gl_create_context(xdisplay, xvinfo, NULL, True);
+	if (!context)
+		context = gtk_gl_create_context(xdisplay, xvinfo, NULL, False);
+	if (!context)
+		g_error("Unable to create OpenGL context,"
+		        "possible graphics driver problem?");
+	g_debug("GtkGl: direct rendering = %d\n", glXIsDirect(xdisplay, context));
+
 	g_object_set_data(G_OBJECT(widget), "glcontext", context);
 
-	/* Fix up colormap */
+	/* Fix up visual/colormap */
+#if GTK_CHECK_VERSION(3,0,0)
+	GdkVisual *visual = gdk_x11_screen_lookup_visual(screen, xvinfo->visualid);
+	gtk_widget_set_visual(widget, visual);
+#else
 	GdkVisual   *visual = gdk_x11_screen_lookup_visual(screen, xvinfo->visualid);
 	GdkColormap *cmap   = gdk_colormap_new(visual, FALSE);
 	gtk_widget_set_colormap(widget, cmap);
+	g_object_unref(cmap);
+#endif
+	XFree(xvinfo);
 
 	/* Disable GTK double buffering */
 	gtk_widget_set_double_buffered(widget, FALSE);
@@ -119,6 +156,42 @@ void gtk_gl_disable(GtkWidget *widget)
 #elif defined(SYS_WIN)
 #include <windows.h>
 #include <gdk/gdkwin32.h>
+#include <GL/gl.h>
+
+/* Windows doens't define OpenGL extensions */
+static void APIENTRY (*glMultiTexCoord2dvPtr)(int target, const double *v);
+static void APIENTRY (*glActiveTexturePtr)(int texture);
+
+void APIENTRY glMultiTexCoord2dv(int target, const double *v)
+{
+	glMultiTexCoord2dvPtr(target, v);
+}
+
+void APIENTRY glActiveTexture(int texture)
+{
+	glActiveTexturePtr(texture);
+}
+
+static void init_extensions(void)
+{
+	static gboolean init_done = FALSE;
+	if (init_done)
+		return;
+	init_done = TRUE;
+
+	g_debug("GtkGl: init_extensions");
+	const guchar *exts = NULL;
+	if (!(exts = glGetString(GL_EXTENSIONS)))
+		g_error("GtkGl: Unable to query extensions");
+	if (!(glMultiTexCoord2dvPtr = (void*)wglGetProcAddress("glMultiTexCoord2dvARB")))
+		g_error("GtkGl: Unable to load glMultiTexCoord2dv extension:\n%s", exts);
+	if (!(glActiveTexturePtr    = (void*)wglGetProcAddress("glActiveTextureARB")))
+		g_error("GtkGl: Unable to load glActiveTexture extension\n%s", exts);
+	g_debug("GtkGl: extensions - glMultiTexCoord2dvPtr=%p glActiveTexturePtr=%p",
+			glMultiTexCoord2dvPtr, glActiveTexturePtr);
+}
+
+/* gtkgl implementation */
 static void on_realize(GtkWidget *widget, gpointer _)
 {
 	g_debug("GtkGl: on_realize");
@@ -167,6 +240,7 @@ void gtk_gl_begin(GtkWidget *widget)
 	HGLRC hRC  = g_object_get_data(G_OBJECT(widget), "glcontext");
 	if (!wglMakeCurrent(hDC, hRC))
 		g_error("GtkGl: wglMakeCurrent failed");
+	init_extensions();
 }
 
 void gtk_gl_end(GtkWidget *widget)
@@ -186,7 +260,6 @@ void gtk_gl_disable(GtkWidget *widget)
 }
 
 
-
 /**************************
  * Mac OSX implementation *
  **************************/
@@ -220,6 +293,8 @@ void gtk_gl_begin(GtkWidget *widget)
 	GtkAllocation alloc;
 	gdk_window_ensure_native(gtk_widget_get_window(widget));
 	gtk_widget_get_allocation(widget, &alloc);
+	gtk_widget_translate_coordinates(widget, gtk_widget_get_toplevel(widget),
+		0, 0, &alloc.x, &alloc.y);
 
 	NSOpenGLContext *ctx  = g_object_get_data(G_OBJECT(widget), "glcontext");
 	GdkWindow       *win  = gtk_widget_get_window(widget);
@@ -230,6 +305,7 @@ void gtk_gl_begin(GtkWidget *widget)
 	[ctx  makeCurrentContext];
 	[ctx  update];
 	[view setFrame:rect];
+	[view setWantsBestResolutionOpenGLSurface:YES];
 }
 
 void gtk_gl_end(GtkWidget *widget)