From 376bbb079843ae3891e6fbefbd2f8b8b4d33ece5 Mon Sep 17 00:00:00 2001
From: evilynux <evilynux@users.sf.net>
Date: Sat, 19 May 2007 18:28:46 +0000
Subject: [PATCH] Moved register_gl_fun stuff from GPU.c to gtk-glade/gdk_gl.c
 . I didn't try to understand the purpose of the register_gl_fun stuff, i just
 fixed things up... is register_gl_fun still usefull?

---
 desmume/src/GPU.c              | 13 -------------
 desmume/src/gtk-glade/gdk_gl.c | 12 ++++++++++++
 desmume/src/gtk-glade/gdk_gl.h |  1 +
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/desmume/src/GPU.c b/desmume/src/GPU.c
index 2388c89a8..9aa3592a4 100644
--- a/desmume/src/GPU.c
+++ b/desmume/src/GPU.c
@@ -111,19 +111,6 @@ GraphicsInterface_struct *GFXCoreList[] = {
 NULL
 };
 
-/*
-BOOL _fun_gl_Begin (int screen) { return FALSE; }
-void _fun_gl_End (int screen) { }
-
-fun_gl_Begin Open_GL_beg = _fun_gl_Begin;
-fun_gl_End   Open_GL_end = _fun_gl_End;
-
-void register_gl_fun(fun_gl_Begin beg,fun_gl_End end) {
-	Open_GL_beg = beg;
-	Open_GL_end = end;
-}
-*/
-
 //static BOOL setFinalColorDirect				(const GPU *gpu, u32 passing, u8 bgnum, u8 *dst, u16 color, u16 x, u16 y);
 static BOOL setFinalColorSpecialNone		(const GPU *gpu, u32 passing, u8 bgnum, u8 *dst, u16 color, u16 x, u16 y);
 static BOOL setFinalColorSpecialBlend		(const GPU *gpu, u32 passing, u8 bgnum, u8 *dst, u16 color, u16 x, u16 y);
diff --git a/desmume/src/gtk-glade/gdk_gl.c b/desmume/src/gtk-glade/gdk_gl.c
index babe8f72e..192644a2a 100755
--- a/desmume/src/gtk-glade/gdk_gl.c
+++ b/desmume/src/gtk-glade/gdk_gl.c
@@ -41,6 +41,18 @@ GLuint screen_texture[1];
 #undef _DUP4
 #undef _DUP2
 
+/* FIXME: Purpose of this code?  */
+BOOL _fun_gl_Begin (int screen) { return FALSE; }
+void _fun_gl_End (int screen) { }
+
+fun_gl_Begin Open_GL_beg = _fun_gl_Begin;
+fun_gl_End   Open_GL_end = _fun_gl_End;
+
+void register_gl_fun(fun_gl_Begin beg,fun_gl_End end) {
+	Open_GL_beg = beg;
+	Open_GL_end = end;
+}
+
 /************************************************/
 /* BEGIN & END                                  */
 /************************************************/
diff --git a/desmume/src/gtk-glade/gdk_gl.h b/desmume/src/gtk-glade/gdk_gl.h
index 32ebb2459..d784e975d 100755
--- a/desmume/src/gtk-glade/gdk_gl.h
+++ b/desmume/src/gtk-glade/gdk_gl.h
@@ -39,6 +39,7 @@ void init_GL_capabilities();
 void init_GL(GtkWidget * widget, int screen, int share_num);
 int init_GL_free_s(GtkWidget * widget, int share_num);
 int init_GL_free(GtkWidget * widget);
+void register_gl_fun(fun_gl_Begin beg,fun_gl_End end);
 #ifdef HAVE_LIBGDKGLEXT_X11_1_0
 static void gtk_init_main_gl_area(GtkWidget *, gpointer);
 static void gtk_init_sub_gl_area(GtkWidget *, gpointer);