From de2edcf84f2ead548d73d67c4d18a5cddb3e68ab Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Fri, 5 Mar 2004 22:57:51 +0000 Subject: [PATCH] Fixed up macosx --- src/native/common/extgl.cpp | 2 +- src/native/macosx/org_lwjgl_opengl_Window.cpp | 14 ++------------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/src/native/common/extgl.cpp b/src/native/common/extgl.cpp index 527c8a7c..d7754dca 100755 --- a/src/native/common/extgl.cpp +++ b/src/native/common/extgl.cpp @@ -902,7 +902,7 @@ void extgl_InitWGL(JNIEnv *env) /*-----------------------------------------------------*/ #ifdef _AGL -bool extgl_InitAGL(JNIEnv *env, jobject ext_set) +bool extgl_InitAGL(JNIEnv *env) { aglChoosePixelFormat = (aglChoosePixelFormatPROC)extgl_GetProcAddress("aglChoosePixelFormat"); aglDestroyPixelFormat = (aglDestroyPixelFormatPROC)extgl_GetProcAddress("aglDestroyPixelFormat"); diff --git a/src/native/macosx/org_lwjgl_opengl_Window.cpp b/src/native/macosx/org_lwjgl_opengl_Window.cpp index 0c93ef08..fa022150 100644 --- a/src/native/macosx/org_lwjgl_opengl_Window.cpp +++ b/src/native/macosx/org_lwjgl_opengl_Window.cpp @@ -108,12 +108,10 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Window_nCreate(JNIEnv *env, jclass throwException(env, "Could not load gl library"); return; } - /* - WARNING COMMENTED OUT, to make compile, needed?, fix? - if (!extgl_InitAGL(env, ext_set)) { + if (!extgl_InitAGL(env)) { throwException(env, "Could not load agl symbols"); return; - }*/ + } if (!current_fullscreen) { if (!switchToNearestMode(env, width, height, bpp, 60)) { destroyMode(env, clazz); @@ -127,14 +125,6 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Window_nCreate(JNIEnv *env, jclass extgl_Close(); return; } - /* - WARNING COMMENTED OUT, to make compile, needed?, fix? - if (!extgl_Initialize(env, ext_set)) { - destroy(env, clazz); - throwException(env, "Could not load gl function pointers"); - return; - } - */ FlushEventQueue(GetMainEventQueue()); }