From e0b36fdaff51b6d9de99ae7e8ca6bd825e407e57 Mon Sep 17 00:00:00 2001
From: Grigori Goronzy <greg@blackbox>
Date: Sun, 27 Sep 2009 03:12:17 +0000
Subject: [PATCH] Use wxGL to make OpenGL usage portable

Originally committed to SVN as r3591.
---
 aegisub/reporter/platform_unix.cpp | 58 +++++++++---------------------
 aegisub/reporter/r_pre.h           |  1 +
 2 files changed, 18 insertions(+), 41 deletions(-)

diff --git a/aegisub/reporter/platform_unix.cpp b/aegisub/reporter/platform_unix.cpp
index 8a8765b8e..dbabdcd10 100644
--- a/aegisub/reporter/platform_unix.cpp
+++ b/aegisub/reporter/platform_unix.cpp
@@ -22,6 +22,7 @@
 #include <wx/string.h>
 #include <wx/app.h>
 #include <wx/apptrait.h>
+#include <wx/glcanvas.h>
 #endif
 
 #include "include/platform.h"
@@ -29,62 +30,37 @@
 
 extern "C" {
 #include <sys/utsname.h>
-#include "GL/glx.h"
-#include "GL/gl.h"
+#ifdef __WXMAC__
+#include "OpenGL/glu.h"
+#include "OpenGL/gl.h"
+#else
+#include <GL/glu.h>
+#include <GL/gl.h>
+#endif
 }
 
+
+
 PlatformUnix::PlatformUnix() {
 	GetVideoInfo();
 }
 
 /**
- * @brief Gather video adapter information via OpenGL/GLX.
+ * @brief Gather video adapter information via OpenGL
  *
  */
 void PlatformUnix::GetVideoInfo() {
-	Display *dpy;
-	XVisualInfo *vi;
-	GLXContext cx;
-	Window root, win;
-	XSetWindowAttributes attr;
-	unsigned long mask;
-	int attList[] = { GLX_RGBA, GLX_DOUBLEBUFFER, None };
-
-	vendor = wxString();
-	renderer = wxString();
-	version = wxString();
-
-	// Like in glxinfo.c, but somewhat simpler and shorter.
-	dpy = XOpenDisplay(0);
-	if (!dpy) return;
-	vi = glXChooseVisual(dpy, DefaultScreen(dpy), attList);
-	if (!vi) return;
-	cx = glXCreateContext(dpy, vi, 0, GL_TRUE);
-	if (!cx) return;
-
-	root = RootWindow(dpy, DefaultScreen(dpy));
-	attr.background_pixel = 0;
-	attr.border_pixel = 0;
-	attr.colormap = XCreateColormap(dpy, root, vi->visual, AllocNone);
-	attr.event_mask = StructureNotifyMask | ExposureMask;
-	mask = CWBackPixel | CWBorderPixel | CWColormap | CWEventMask;
-	win = XCreateWindow(dpy, root, 0, 0, 100, 100, 0, vi->depth,
-						InputOutput, vi->visual, mask, &attr);
-
-	if (!glXMakeCurrent(dpy, win, cx)) {
-		glXDestroyContext(dpy, cx);
-		XDestroyWindow(dpy, win);
-		XCloseDisplay(dpy);
-		return;
-	}
+	int attList[] = { WX_GL_RGBA, WX_GL_DOUBLEBUFFER, 0 };
+	wxGLCanvas *glc = new wxGLCanvas(wxTheApp->GetTopWindow(), wxID_ANY, attList, wxDefaultPosition, wxDefaultSize);
+	wxGLContext *ctx = new wxGLContext(glc, 0);
+	ctx->SetCurrent(glc);
 
 	vendor = wxString(glGetString(GL_VENDOR));
 	renderer = wxString(glGetString(GL_RENDERER));
 	version = wxString(glGetString(GL_VERSION));
 
-	glXDestroyContext(dpy, cx);
-	XDestroyWindow(dpy, win);
-	XCloseDisplay(dpy);
+	delete ctx;
+	delete glc;
 }
 
 wxString PlatformUnix::OSVersion() {
diff --git a/aegisub/reporter/r_pre.h b/aegisub/reporter/r_pre.h
index 2049aa7be..c652d111d 100644
--- a/aegisub/reporter/r_pre.h
+++ b/aegisub/reporter/r_pre.h
@@ -45,6 +45,7 @@
 #include <wx/font.h>
 #include <wx/frame.h>
 #include <wx/gdicmn.h>
+#include <wx/glcanvas.h>
 #include <wx/intl.h>
 #include <wx/listctrl.h>
 #include <wx/log.h>