diff --git a/src/native/linux/context.c b/src/native/linux/context.c
index aa7e40eb..789c5a46 100644
--- a/src/native/linux/context.c
+++ b/src/native/linux/context.c
@@ -271,7 +271,7 @@ bool initPeerInfo(JNIEnv *env, jobject peer_info_handle, Display *display, int s
 		throwException(env, "Samples > 0 specified but there's no support for GLX_ARB_multisample");
 		return false;
 	}
-	bool floating_point = (int)(*env)->GetIntField(env, pixel_format, (*env)->GetFieldID(env, cls_pixel_format, "floating_point", "Z"));
+	bool floating_point = (bool)(*env)->GetIntField(env, pixel_format, (*env)->GetFieldID(env, cls_pixel_format, "floating_point", "Z"));
 	if (floating_point && !extension_flags.GLX_ARB_fbconfig_float) {
 		throwException(env, "Floating point specified but there's no support for GLX_ARB_fbconfig_float");
 		return false;
diff --git a/src/native/win32/context.c b/src/native/win32/context.c
index 1eb08815..052b4075 100644
--- a/src/native/win32/context.c
+++ b/src/native/win32/context.c
@@ -183,6 +183,8 @@ static int findPixelFormatARBFromBPP(JNIEnv *env, HDC hdc, WGLExtensions *extens
 	int accum_bpp = (int)(*env)->GetIntField(env, pixel_format, (*env)->GetFieldID(env, cls_pixel_format, "accum_bpp", "I"));
 	int accum_alpha = (int)(*env)->GetIntField(env, pixel_format, (*env)->GetFieldID(env, cls_pixel_format, "accum_alpha", "I"));
 	jboolean stereo = (*env)->GetBooleanField(env, pixel_format, (*env)->GetFieldID(env, cls_pixel_format, "stereo", "Z"));
+	bool floating_point = (bool)(*env)->GetIntField(env, pixel_format, (*env)->GetFieldID(env, cls_pixel_format, "floating_point", "Z"));
+	int pixel_type = floating_point ? WGL_TYPE_RGBA_FLOAT_ARB : WGL_TYPE_RGBA_ARB;
 	int iPixelFormat;
 	unsigned int num_formats_returned;
 	attrib_list_t attrib_list;
@@ -200,7 +202,7 @@ static int findPixelFormatARBFromBPP(JNIEnv *env, HDC hdc, WGLExtensions *extens
 	}
 	if (!getBooleanProperty(env, "org.lwjgl.opengl.Display.allowSoftwareOpenGL"))
 		putAttrib(&attrib_list, WGL_ACCELERATION_ARB); putAttrib(&attrib_list, WGL_FULL_ACCELERATION_ARB);
-	putAttrib(&attrib_list, WGL_PIXEL_TYPE_ARB); putAttrib(&attrib_list, WGL_TYPE_RGBA_ARB);
+	putAttrib(&attrib_list, WGL_PIXEL_TYPE_ARB); putAttrib(&attrib_list, pixel_type);
 	putAttrib(&attrib_list, WGL_DOUBLE_BUFFER_ARB); putAttrib(&attrib_list, double_buffer ? TRUE : FALSE);
 	putAttrib(&attrib_list, WGL_SUPPORT_OPENGL_ARB); putAttrib(&attrib_list, TRUE);
 	putAttrib(&attrib_list, WGL_COLOR_BITS_ARB); putAttrib(&attrib_list, bpp);
@@ -217,7 +219,7 @@ static int findPixelFormatARBFromBPP(JNIEnv *env, HDC hdc, WGLExtensions *extens
 	putAttrib(&attrib_list, WGL_STEREO_ARB); putAttrib(&attrib_list, stereo ? TRUE : FALSE);
 	putAttrib(&attrib_list, WGL_AUX_BUFFERS_ARB); putAttrib(&attrib_list, num_aux_buffers);
 	// Assume caller checked extension availability
-	if ( pixelFormatCaps != NULL ) {
+	if (pixelFormatCaps != NULL) {
 		pixelFormatCaps_ptr = (GLuint *)(*env)->GetDirectBufferAddress(env, pixelFormatCaps);
 		pixelFormatCapsSize = (*env)->GetDirectBufferCapacity(env, pixelFormatCaps);
 
@@ -358,6 +360,7 @@ int findPixelFormatOnDC(JNIEnv *env, HDC hdc, jobject pixel_format, jobject pixe
 	int pixel_format_id;
 	jclass cls_pixel_format = (*env)->GetObjectClass(env, pixel_format);
 	int samples = (int)(*env)->GetIntField(env, pixel_format, (*env)->GetFieldID(env, cls_pixel_format, "samples", "I"));
+	bool floating_point = (bool)(*env)->GetIntField(env, pixel_format, (*env)->GetFieldID(env, cls_pixel_format, "floating_point", "Z"));
 	bool use_arb_selection = samples > 0 || pbuffer || pixelFormatCaps != NULL;
 	pixel_format_id = findPixelFormatDefault(env, hdc, pixel_format, use_hdc_bpp, double_buffer);
 	if (use_arb_selection) {
@@ -392,6 +395,12 @@ int findPixelFormatOnDC(JNIEnv *env, HDC hdc, jobject pixel_format, jobject pixe
 			throwException(env, "No support for WGL_ARB_multisample");
 			return -1;
 		}
+		if (floating_point && !extensions.WGL_ARB_pixel_format_float) {
+			wglMakeCurrent(saved_current_hdc, saved_current_hglrc);
+			wglDeleteContext(dummy_hglrc);
+			throwException(env, "No support for WGL_ARB_pixel_format_float");
+			return -1;
+		}
 		if (pixelFormatCaps != NULL && !extensions.WGL_ARB_render_texture) {
 			wglMakeCurrent(saved_current_hdc, saved_current_hglrc);
 			wglDeleteContext(dummy_hglrc);
diff --git a/src/native/win32/extgl_wgl.c b/src/native/win32/extgl_wgl.c
index c4db0e1d..7e8d9c18 100644
--- a/src/native/win32/extgl_wgl.c
+++ b/src/native/win32/extgl_wgl.c
@@ -133,6 +133,7 @@ static void extgl_InitSupportedWGLExtensions(WGLExtensions *extensions) {
 	extensions->WGL_ARB_buffer_region = WGLQueryExtension(extensions, "WGL_ARB_buffer_region");
 	extensions->WGL_ARB_make_current_read = WGLQueryExtension(extensions, "WGL_ARB_make_current_read");
 	extensions->WGL_ARB_multisample = WGLQueryExtension(extensions, "WGL_ARB_multisample");
+	extensions->WGL_ARB_pixel_format_float = WGLQueryExtension(extensions, "WGL_ARB_pixel_format_float");
 	extensions->WGL_ARB_pbuffer = WGLQueryExtension(extensions, "WGL_ARB_pbuffer");
 	extensions->WGL_ARB_pixel_format = WGLQueryExtension(extensions, "WGL_ARB_pixel_format");
 	extensions->WGL_ARB_render_texture = WGLQueryExtension(extensions, "WGL_ARB_render_texture");
diff --git a/src/native/win32/extgl_wgl.h b/src/native/win32/extgl_wgl.h
index 291354ae..f98fd3f4 100644
--- a/src/native/win32/extgl_wgl.h
+++ b/src/native/win32/extgl_wgl.h
@@ -160,6 +160,12 @@ typedef HDC (APIENTRY * wglGetCurrentReadDCARBPROC) (void);
 #define WGL_SAMPLE_BUFFERS_ARB                                  0x2041
 #define WGL_SAMPLES_ARB                                         0x2042
 
+/*-------------------------------------------------------------------*/
+/*------------WGL_ARB_pixel_format_float ----------------------------*/
+/*-------------------------------------------------------------------*/
+
+#define WGL_TYPE_RGBA_FLOAT_ARB									0x21A0
+
 typedef struct {
     bool WGL_ARB_buffer_region;
     bool WGL_ARB_extensions_string;
@@ -172,6 +178,7 @@ typedef struct {
     bool WGL_EXT_swap_control;
     bool WGL_NV_render_depth_texture;
     bool WGL_NV_render_texture_rectangle;
+    bool WGL_ARB_pixel_format_float;
 	wglGetExtensionsStringEXTPROC wglGetExtensionsStringEXT;
 
 	wglGetExtensionsStringARBPROC wglGetExtensionsStringARB;