java-game-lib-cvs Mailing List for Lightweight Java Game Library

Revision: 3050
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3050&view=rev
Author:   elias_naur
Date:     2008-04-29 11:56:46 -0700 (Tue, 29 Apr 2008)

Log Message:
-----------
Windows: Improved error messages for nChoosePixelFormat

Modified Paths:
--------------
    trunk/LWJGL/src/native/windows/context.c

Modified: trunk/LWJGL/src/native/windows/context.c
===================================================================
--- trunk/LWJGL/src/native/windows/context.c	2008-04-29 18:37:51 UTC (rev 3049)
+++ trunk/LWJGL/src/native/windows/context.c	2008-04-29 18:56:46 UTC (rev 3050)
@@ -252,6 +252,7 @@
 	result = extensions->wglChoosePixelFormatARB(hdc, attrib_list.attribs, NULL, 1, &iPixelFormat, &num_formats_returned);
 
 	if (result == FALSE || num_formats_returned < 1) {
+		throwFormattedException(env, "Failed to find ARB pixel format %d %d\n", result, num_formats_returned);
 		return -1;
 	}
 	return iPixelFormat;
@@ -260,13 +261,16 @@
 static int findPixelFormatARB(JNIEnv *env, HDC hdc, WGLExtensions *extensions, jobject pixel_format, jobject pixelFormatCaps, bool use_hdc_bpp, bool window, bool pbuffer, bool double_buffer, bool floating_point) {
 	int bpp;
 	int iPixelFormat;
+	int fallback_bpp = 16;
 	jclass cls_pixel_format = (*env)->GetObjectClass(env, pixel_format);
 	if (use_hdc_bpp) {
 		bpp = GetDeviceCaps(hdc, BITSPIXEL);
 		iPixelFormat = findPixelFormatARBFromBPP(env, hdc, extensions, pixel_format, pixelFormatCaps, bpp, window, pbuffer, double_buffer, floating_point);
-		if (iPixelFormat == -1)
-			bpp = 16;
-		else
+		if ((*env)->ExceptionOccurred(env)) {
+			(*env)->ExceptionClear(env);
+			printfDebugJava(env, "Failed to find ARB pixel format with HDC depth %d, falling back to %d\n", bpp, fallback_bpp);
+			bpp = fallback_bpp;
+		} else
 			return iPixelFormat;
 	} else
 		bpp = (int)(*env)->GetIntField(env, pixel_format, (*env)->GetFieldID(env, cls_pixel_format, "bpp", "I"));
@@ -313,32 +317,32 @@
 	// get the best available match of pixel format for the device context  
 	iPixelFormat = ChoosePixelFormat(hdc, &pfd);
 	if (iPixelFormat == 0) {
-		printfDebugJava(env, "Failed to choose pixel format");
+		throwException(env, "Failed to choose pixel format");
 		return -1;
 	}
 
 	if (DescribePixelFormat(hdc, iPixelFormat, sizeof(PIXELFORMATDESCRIPTOR), &desc) == 0) {
-		printfDebugJava(env, "Could not describe pixel format");
+		throwException(env, "Could not describe pixel format");
 		return -1;
 	}
 
 	if (desc.cColorBits < bpp) {
-		printfDebugJava(env, "Insufficient color precision");
+		throwException(env, "Insufficient color precision");
 		return -1;
 	}
 
 	if (desc.cAlphaBits < alpha) {
-		printfDebugJava(env, "Insufficient alpha precision");
+		throwException(env, "Insufficient alpha precision");
 		return -1;
 	}
 
 	if (desc.cStencilBits < stencil) {
-		printfDebugJava(env, "Insufficient stencil precision");
+		throwException(env, "Insufficient stencil precision");
 		return -1;
 	}
 
 	if (desc.cDepthBits < depth) {
-		printfDebugJava(env, "Insufficient depth buffer precision");
+		throwException(env, "Insufficient depth buffer precision");
 		return -1;
 	}
 
@@ -346,13 +350,13 @@
 		jboolean allowSoftwareOpenGL = getBooleanProperty(env, "org.lwjgl.opengl.Display.allowSoftwareOpenGL");
 		// secondary check for software override
 		if(!allowSoftwareOpenGL) {
-			printfDebugJava(env, "Pixel format not accelerated");
+			throwException(env, "Pixel format not accelerated");
 			return -1;
 		}
 	}
 
 	if ((desc.dwFlags & flags) != flags) {
-		printfDebugJava(env, "Capabilities not supported");
+		throwException(env, "Capabilities not supported");
 		return -1;
 	}
 	return iPixelFormat;
@@ -361,13 +365,16 @@
 static int findPixelFormatDefault(JNIEnv *env, HDC hdc, jobject pixel_format, bool use_hdc_bpp, bool double_buffer) {
 	int bpp;
 	int iPixelFormat;
+	int fallback_bpp = 16;
 	jclass cls_pixel_format = (*env)->GetObjectClass(env, pixel_format);
 	if (use_hdc_bpp) {
 		bpp = GetDeviceCaps(hdc, BITSPIXEL);
 		iPixelFormat = findPixelFormatFromBPP(env, hdc, pixel_format, bpp, double_buffer);
-		if (iPixelFormat == -1)
-			bpp = 16;
-		else
+		if ((*env)->ExceptionOccurred(env)) {
+			(*env)->ExceptionClear(env);
+			printfDebugJava(env, "Failed to find pixel format with HDC depth %d, falling back to %d\n", bpp, fallback_bpp);
+			bpp = fallback_bpp;
+		} else
 			return iPixelFormat;
 	} else
 		bpp = (int)(*env)->GetIntField(env, pixel_format, (*env)->GetFieldID(env, cls_pixel_format, "bpp", "I"));
@@ -417,7 +424,7 @@
 	int samples = (int)(*env)->GetIntField(env, pixel_format, (*env)->GetFieldID(env, cls_pixel_format, "samples", "I"));
 	bool use_arb_selection = samples > 0 || floating_point || pbuffer || pixelFormatCaps != NULL;
 	pixel_format_id = findPixelFormatDefault(env, hdc, pixel_format, use_hdc_bpp, double_buffer);
-	if (pixel_format_id != -1 && use_arb_selection) {
+	if (!(*env)->ExceptionOccurred(env) && use_arb_selection) {
 		dummy_hwnd = createDummyWindow(origin_x, origin_y);
 		if (dummy_hwnd == NULL) {
 			throwException(env, "Could not create dummy window");
@@ -439,15 +446,11 @@
 		saved_current_hglrc = wglGetCurrentContext();
 		if (validateAndGetExtensions(env, &extensions, dummy_hdc, dummy_hglrc, samples, floating_point, pixelFormatCaps)) {
 			pixel_format_id = findPixelFormatARB(env, hdc, &extensions, pixel_format, pixelFormatCaps, use_hdc_bpp, window, pbuffer, double_buffer, floating_point);
-		} else
-			pixel_format_id = -1;
+		}
 		wglMakeCurrent(saved_current_hdc, saved_current_hglrc);
 		wglDeleteContext(dummy_hglrc);
 		closeWindow(&dummy_hwnd, &dummy_hdc);
 	}
-	if (pixel_format_id == -1) {
-		throwException(env, "Could not find a valid pixel format");
-	}
 	return pixel_format_id;
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3049
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3049&view=rev
Author:   elias_naur
Date:     2008-04-29 11:37:51 -0700 (Tue, 29 Apr 2008)

Log Message:
-----------
Windows: Fixed compile error

Modified Paths:
--------------
    trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c

Modified: trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c
===================================================================
--- trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c	2008-04-29 18:32:08 UTC (rev 3048)
+++ trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c	2008-04-29 18:37:51 UTC (rev 3049)
@@ -178,7 +178,7 @@
 	return getAvailableDisplayModes(env);
 }
 
-static void destroyWindow() {
+static void destroyWindow(JNIEnv *env) {
 	jclass display_class_global = (jclass)(LONG_PTR)GetWindowLongPtr(display_hwnd, GWLP_USERDATA);
 	closeWindow(&display_hwnd, &display_hdc);
 	if (display_class_global != NULL)
@@ -209,14 +209,14 @@
 	}
 	display_hdc = GetDC(display_hwnd);
 	if (display_hdc == NULL) {
-		destroyWindow();
+		destroyWindow(env);
 		throwException(env, "Failed to get the window DC.");
 		return;
 	}
 }
 
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_WindowsDisplay_nDestroyWindow(JNIEnv *env, jclass clazz) {
-	destroyWindow();
+	destroyWindow(env);
 }
 
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_WindowsDisplay_clientToScreen(JNIEnv *env, jclass unused, jlong hwnd_int, jobject buffer_handle) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3048
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3048&view=rev
Author:   elias_naur
Date:     2008-04-29 11:32:08 -0700 (Tue, 29 Apr 2008)

Log Message:
-----------
Windows: Added error handling to nCreateWindow

Modified Paths:
--------------
    trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c

Modified: trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c
===================================================================
--- trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c	2008-04-27 13:37:00 UTC (rev 3047)
+++ trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c	2008-04-29 18:32:08 UTC (rev 3048)
@@ -178,6 +178,15 @@
 	return getAvailableDisplayModes(env);
 }
 
+static void destroyWindow() {
+	jclass display_class_global = (jclass)(LONG_PTR)GetWindowLongPtr(display_hwnd, GWLP_USERDATA);
+	closeWindow(&display_hwnd, &display_hdc);
+	if (display_class_global != NULL)
+		(*env)->DeleteGlobalRef(env, display_class_global);
+	freeLargeIcon();
+	freeSmallIcon();
+}
+
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_WindowsDisplay_nCreateWindow(JNIEnv *env, jobject self, jobject mode, jboolean fullscreen, jint x, jint y, jboolean undecorated, jlong parent_hwnd) {
 	jclass cls_displayMode = (*env)->GetObjectClass(env, mode);
 	jfieldID fid_width = (*env)->GetFieldID(env, cls_displayMode, "width", "I");
@@ -199,15 +208,15 @@
 		return;
 	}
 	display_hdc = GetDC(display_hwnd);
+	if (display_hdc == NULL) {
+		destroyWindow();
+		throwException(env, "Failed to get the window DC.");
+		return;
+	}
 }
 
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_WindowsDisplay_nDestroyWindow(JNIEnv *env, jclass clazz) {
-	jclass display_class_global = (jclass)(LONG_PTR)GetWindowLongPtr(display_hwnd, GWLP_USERDATA);
-	closeWindow(&display_hwnd, &display_hdc);
-	if (display_class_global != NULL)
-		(*env)->DeleteGlobalRef(env, display_class_global);
-	freeLargeIcon();
-	freeSmallIcon();
+	destroyWindow();
 }
 
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_WindowsDisplay_clientToScreen(JNIEnv *env, jclass unused, jlong hwnd_int, jobject buffer_handle) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Women flock to men with monstrous diggs like bees to honey. http://www.aspicei.com/