michael/lwjgl
michael
/
lwjgl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed WGL extension bug

This commit is contained in:
Elias Naur 2003-07-26 09:39:48 +00:00
parent 254681763d
commit 579dc64f4f
4 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/java/org/lwjgl/opengl/GLWindow.java
View File

@ -243,7 +243,7 @@ public class GLWindow extends Window {
* Checks and sets WGL_EXT_extensions_string and WGL_ARB_extensions_string * Checks and sets WGL_EXT_extensions_string and WGL_ARB_extensions_string
* if available. * if available.
*/ */
private static native void checkWGLExtensionsString(); private native void checkWGLExtensionsString();
/** /**
* Determine which WGL extensions are available * Determine which WGL extensions are available

9
src/native/common/org_lwjgl_opengl_GLWindow.h
View File

@ -10,13 +10,6 @@ extern "C" {
/* Inaccessible static: _00024assertionsDisabled */ /* Inaccessible static: _00024assertionsDisabled */
/* Inaccessible static: currentWindow */ /* Inaccessible static: currentWindow */
/* Inaccessible static: class_00024org_00024lwjgl_00024Window */ /* Inaccessible static: class_00024org_00024lwjgl_00024Window */
/* Inaccessible static: WGL_ARB_buffer_region */
/* Inaccessible static: WGL_ARB_extensions_string */
/* Inaccessible static: WGL_ARB_pbuffer */
/* Inaccessible static: WGL_ARB_pixel_format */
/* Inaccessible static: WGL_ARB_render_texture */
/* Inaccessible static: WGL_EXT_extensions_string */
/* Inaccessible static: WGL_EXT_swap_control */
/* Inaccessible static: class_00024org_00024lwjgl_00024opengl_00024GL */ /* Inaccessible static: class_00024org_00024lwjgl_00024opengl_00024GL */
/* /*
* Class: org_lwjgl_opengl_GLWindow * Class: org_lwjgl_opengl_GLWindow
@ -24,7 +17,7 @@ extern "C" {
* Signature: ()V * Signature: ()V
*/ */
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLWindow_checkWGLExtensionsString JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLWindow_checkWGLExtensionsString
(JNIEnv *, jclass); (JNIEnv *, jobject);
/* /*
* Class: org_lwjgl_opengl_GLWindow * Class: org_lwjgl_opengl_GLWindow

11
src/native/linux/org_lwjgl_opengl_GLWindow.cpp
View File

@ -259,12 +259,13 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLWindow_nCreate
* Class: org_lwjgl_opengl_GL * Class: org_lwjgl_opengl_GL
* Method: checkWGLExtensionsString * Method: checkWGLExtensionsString
*/ */
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLWindow_checkWGLExtensionsString(JNIEnv * env, jclass clazz) JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLWindow_checkWGLExtensionsString(JNIEnv * env, jobject obj)
{ {
jfieldID fid_WGL_ARB_extensions_string = env->GetStaticFieldID(clazz, "WGL_ARB_extensions_string", "Z"); jclass clazz = env->GetObjectClass(obj);
jfieldID fid_WGL_EXT_extensions_string = env->GetStaticFieldID(clazz, "WGL_EXT_extensions_string", "Z"); jfieldID fid_WGL_ARB_extensions_string = env->GetFieldID(clazz, "WGL_ARB_extensions_string", "Z");
env->SetStaticBooleanField(clazz, fid_WGL_ARB_extensions_string, JNI_FALSE); jfieldID fid_WGL_EXT_extensions_string = env->GetFieldID(clazz, "WGL_EXT_extensions_string", "Z");
env->SetStaticBooleanField(clazz, fid_WGL_EXT_extensions_string, JNI_FALSE); env->SetBooleanField(obj, fid_WGL_ARB_extensions_string, JNI_FALSE);
env->SetBooleanField(obj, fid_WGL_EXT_extensions_string, JNI_FALSE);
} }
/* /*

11
src/native/win32/org_lwjgl_opengl_GLWindow.cpp
View File

@ -210,14 +210,15 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLWindow_nDestroyGL
* Class: org_lwjgl_opengl_GL * Class: org_lwjgl_opengl_GL
* Method: checkWGLExtensionsString * Method: checkWGLExtensionsString
*/ */
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLWindow_checkWGLExtensionsString(JNIEnv * env, jclass clazz) JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLWindow_checkWGLExtensionsString(JNIEnv * env, jobject obj)
{ {
jfieldID fid_WGL_ARB_extensions_string = env->GetStaticFieldID(clazz, "WGL_ARB_extensions_string", "Z"); jclass clazz = env->GetObjectClass(obj);
jfieldID fid_WGL_EXT_extensions_string = env->GetStaticFieldID(clazz, "WGL_EXT_extensions_string", "Z"); jfieldID fid_WGL_ARB_extensions_string = env->GetFieldID(clazz, "WGL_ARB_extensions_string", "Z");
jfieldID fid_WGL_EXT_extensions_string = env->GetFieldID(clazz, "WGL_EXT_extensions_string", "Z");
if (wglGetExtensionsStringARB) if (wglGetExtensionsStringARB)
env->SetStaticBooleanField(clazz, fid_WGL_ARB_extensions_string, JNI_TRUE); env->SetBooleanField(obj, fid_WGL_ARB_extensions_string, JNI_TRUE);
if (wglGetExtensionsStringEXT) if (wglGetExtensionsStringEXT)
env->SetStaticBooleanField(clazz, fid_WGL_EXT_extensions_string, JNI_TRUE); env->SetBooleanField(obj, fid_WGL_EXT_extensions_string, JNI_TRUE);
} }
/* /*