ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merged 1397 into release branch to fix 

http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=455749
This commit is contained in:
yabause 2009-01-05 22:25:07 +00:00
parent 9a0a853ab0
commit 3206129d97
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gtk-glade/gdk_3Demu.cpp
View File

@ -154,11 +154,11 @@ initialise_gdk_3d( void) {
} }
int int
init_opengl_gdk_3Demu( void) { init_opengl_gdk_3Demu( GdkDrawable * drawable) {
GdkGLConfig *glconfig; GdkGLConfig *glconfig;
/* create the off screen pixmap */ /* 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) { if ( target_pixmap == NULL) {
g_print (_("*** Failed to create pixmap.\n")); g_print (_("*** Failed to create pixmap.\n"));

2
src/gtk-glade/gdk_3Demu.h
View File

@ -27,6 +27,6 @@
*/ */
int int
init_opengl_gdk_3Demu( void); init_opengl_gdk_3Demu( GdkDrawable * drawable);
#endif #endif

2
src/gtk-glade/main.cpp
View File

@ -497,7 +497,7 @@ common_gtk_glade_main( struct configured_features *my_config) {
#ifdef GTKGLEXT_AVAILABLE #ifdef GTKGLEXT_AVAILABLE
if ( !use_null_3d) { if ( !use_null_3d) {
/* setup the gdk 3D emulation */ /* setup the gdk 3D emulation */
if ( init_opengl_gdk_3Demu()) { if ( init_opengl_gdk_3Demu(GDK_DRAWABLE(pWindow->window))) {
NDS_3D_SetDriver(1); NDS_3D_SetDriver(1);
if (!gpu3D->NDS_3D_Init()) { if (!gpu3D->NDS_3D_Init()) {

4
src/gtk/gdk_3Demu.cpp
View File

@ -151,11 +151,11 @@ _oglrender_init( void) {
} }
int int
init_opengl_gdk_3Demu( void) { init_opengl_gdk_3Demu( GdkDrawable * drawable) {
GdkGLConfig *glconfig; GdkGLConfig *glconfig;
/* create the off screen pixmap */ /* 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) { if ( target_pixmap == NULL) {
g_print ("*** Failed to create pixmap.\n"); g_print ("*** Failed to create pixmap.\n");

2
src/gtk/gdk_3Demu.h
View File

@ -27,6 +27,6 @@
*/ */
int int
init_opengl_gdk_3Demu( void); init_opengl_gdk_3Demu( GdkDrawable * drawable);
#endif #endif

2
src/gtk/main.cpp
View File

@ -1878,7 +1878,7 @@ common_gtk_main( struct configured_features *my_config)
#ifdef GTKGLEXT_AVAILABLE #ifdef GTKGLEXT_AVAILABLE
if ( !use_null_3d) { if ( !use_null_3d) {
/* setup the gdk 3D emulation */ /* setup the gdk 3D emulation */
if ( init_opengl_gdk_3Demu()) { if ( init_opengl_gdk_3Demu(GDK_DRAWABLE(pWindow->window))) {
NDS_3D_SetDriver ( 1); NDS_3D_SetDriver ( 1);
if (!gpu3D->NDS_3D_Init ()) { if (!gpu3D->NDS_3D_Init ()) {