Commit 3206129d authored by yabause's avatar yabause
Browse files

Merged 1397 into release branch to fix

http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=455749
parent 9a0a853a
......@@ -154,11 +154,11 @@ initialise_gdk_3d( void) {
}
int
init_opengl_gdk_3Demu( void) {
init_opengl_gdk_3Demu( GdkDrawable * drawable) {
GdkGLConfig *glconfig;
/* create the off screen pixmap */
target_pixmap = gdk_pixmap_new ( NULL, 256, 192, 24);
target_pixmap = gdk_pixmap_new ( drawable, 256, 192, -1);
if ( target_pixmap == NULL) {
g_print (_("*** Failed to create pixmap.\n"));
......
......@@ -27,6 +27,6 @@
*/
int
init_opengl_gdk_3Demu( void);
init_opengl_gdk_3Demu( GdkDrawable * drawable);
#endif
......@@ -497,7 +497,7 @@ common_gtk_glade_main( struct configured_features *my_config) {
#ifdef GTKGLEXT_AVAILABLE
if ( !use_null_3d) {
/* setup the gdk 3D emulation */
if ( init_opengl_gdk_3Demu()) {
if ( init_opengl_gdk_3Demu(GDK_DRAWABLE(pWindow->window))) {
NDS_3D_SetDriver(1);
if (!gpu3D->NDS_3D_Init()) {
......
......@@ -151,11 +151,11 @@ _oglrender_init( void) {
}
int
init_opengl_gdk_3Demu( void) {
init_opengl_gdk_3Demu( GdkDrawable * drawable) {
GdkGLConfig *glconfig;
/* create the off screen pixmap */
target_pixmap = gdk_pixmap_new ( NULL, 256, 192, 24);
target_pixmap = gdk_pixmap_new ( drawable, 256, 192, -1);
if ( target_pixmap == NULL) {
g_print ("*** Failed to create pixmap.\n");
......
......@@ -27,6 +27,6 @@
*/
int
init_opengl_gdk_3Demu( void);
init_opengl_gdk_3Demu( GdkDrawable * drawable);
#endif
......@@ -1878,7 +1878,7 @@ common_gtk_main( struct configured_features *my_config)
#ifdef GTKGLEXT_AVAILABLE
if ( !use_null_3d) {
/* setup the gdk 3D emulation */
if ( init_opengl_gdk_3Demu()) {
if ( init_opengl_gdk_3Demu(GDK_DRAWABLE(pWindow->window))) {
NDS_3D_SetDriver ( 1);
if (!gpu3D->NDS_3D_Init ()) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment