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

Fixed up linux for JOGL integration work

This commit is contained in:
Elias Naur 2004-02-25 18:09:10 +00:00
parent 52a709efd6
commit 0cc4f710a8
4 changed files with 20 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/native/common/Makefile.am
View File

@ -34,6 +34,7 @@ COMMON = \
org_lwjgl_openal_eax_EAXBufferProperties.h \ org_lwjgl_openal_eax_EAXBufferProperties.h \
org_lwjgl_openal_eax_EAXListenerProperties.cpp \ org_lwjgl_openal_eax_EAXListenerProperties.cpp \
org_lwjgl_openal_eax_EAXListenerProperties.h \ org_lwjgl_openal_eax_EAXListenerProperties.h \
org_lwjgl_opengl_GLContext.cpp \
org_lwjgl_opengl_GL11.cpp \ org_lwjgl_opengl_GL11.cpp \
org_lwjgl_opengl_GL11.h \ org_lwjgl_opengl_GL11.h \
org_lwjgl_opengl_GL12.cpp \ org_lwjgl_opengl_GL12.cpp \

59
src/native/common/extgl.cpp
View File

@ -734,69 +734,40 @@ void *extgl_GetProcAddress(const char *name)
} }
static bool QueryExtension(JNIEnv *env, jobject ext_set, const GLubyte*extensions, const char *name) static bool QueryExtension(JNIEnv *env, jobject ext_set, const GLubyte*extensions, const char *name)
{ {
const GLubyte *start; const GLubyte *start;
GLubyte *where, *terminator; GLubyte *where, *terminator;
if (extensions == NULL) { if (extensions == NULL) {
printfDebug("NULL extension string\n"); printfDebug("NULL extension string\n");
extgl_error = true; extgl_error = true;
return false; return false;
} }
/* Extension names should not have spaces. */ /* Extension names should not have spaces. */
where = (GLubyte *) strchr(name, ' '); where = (GLubyte *) strchr(name, ' ');
if (where || *name == '\0') if (where || *name == '\0')
return false; return false;
/* It takes a bit of care to be fool-proof about parsing the /* It takes a bit of care to be fool-proof about parsing the
OpenGL extensions string. Don't be fooled by sub-strings, OpenGL extensions string. Don't be fooled by sub-strings,
etc. */ etc. */
start = extensions; start = extensions;
for (;;) for (;;)
{ {
where = (GLubyte *) strstr((const char *) start, name); where = (GLubyte *) strstr((const char *) start, name);
if (!where) if (!where)
break; break;
terminator = where + strlen(name); terminator = where + strlen(name);
if (where == start || *(where - 1) == ' ') if (where == start || *(where - 1) == ' ')
if (*terminator == ' ' || *terminator == '\0') { if (*terminator == ' ' || *terminator == '\0') {
if (ext_set != NULL) { if (ext_set != NULL) {
insertExtension(env, ext_set, name); insertExtension(env, ext_set, name);
} }
return true; return true;
} }
start = terminator; start = terminator;
} }
return false; return false;
} }
@ -976,10 +947,10 @@ bool extgl_InitAGL(JNIEnv *env, jobject ext_set)
#ifdef _X11 #ifdef _X11
/** returns true if the extention is available */ /** returns true if the extention is available */
static bool GLXQueryExtension(JNIEnv* env, jobject ext_set, Display *disp, int screen, const char *name) static bool GLXQueryExtension(JNIEnv* env, Display *disp, int screen, const char *name)
{ {
const GLubyte *exts = (const GLubyte *)glXQueryExtensionsString(disp, screen); const GLubyte *exts = (const GLubyte *)glXQueryExtensionsString(disp, screen);
return QueryExtension(env, ext_set, exts, name); return QueryExtension(env, NULL, exts, name);
} }
#endif #endif
@ -1022,7 +993,7 @@ static void extgl_InitEXTCullVertex(JNIEnv *env, jobject ext_set)
*/ */
#ifdef _X11 #ifdef _X11
static void extgl_InitGLX13(JNIEnv *env, jobject ext_set) static void extgl_InitGLX13(JNIEnv *env)
{ {
if (extgl_Extensions.GLX13 != 1) if (extgl_Extensions.GLX13 != 1)
return; return;
@ -1044,7 +1015,7 @@ static void extgl_InitGLX13(JNIEnv *env, jobject ext_set)
glXQueryContext = (glXQueryContextPROC) extgl_GetProcAddress("glXQueryContext"); glXQueryContext = (glXQueryContextPROC) extgl_GetProcAddress("glXQueryContext");
glXSelectEvent = (glXSelectEventPROC) extgl_GetProcAddress("glXSelectEvent"); glXSelectEvent = (glXSelectEventPROC) extgl_GetProcAddress("glXSelectEvent");
glXGetSelectedEvent = (glXGetSelectedEventPROC) extgl_GetProcAddress("glXGetSelectedEvent"); glXGetSelectedEvent = (glXGetSelectedEventPROC) extgl_GetProcAddress("glXGetSelectedEvent");
EXTGL_SANITY_CHECK(env, ext_set, GLX13) EXTGL_SANITY_CHECK(env, (jobject)NULL, GLX13);
} }
static bool extgl_InitGLX12(void) static bool extgl_InitGLX12(void)
@ -1072,23 +1043,23 @@ static bool extgl_InitGLX12(void)
return !extgl_error; return !extgl_error;
} }
static void extgl_InitGLXSupportedExtensions(JNIEnv *env, jobject ext_set, Display *disp, int screen) static void extgl_InitGLXSupportedExtensions(JNIEnv *env, Display *disp, int screen)
{ {
extgl_Extensions.GLX_EXT_visual_info = GLXQueryExtension(env, ext_set, disp, screen, "GLX_EXT_visual_info"); extgl_Extensions.GLX_EXT_visual_info = GLXQueryExtension(env, disp, screen, "GLX_EXT_visual_info");
extgl_Extensions.GLX_EXT_visual_rating = GLXQueryExtension(env, ext_set, disp, screen, "GLX_EXT_visual_rating"); extgl_Extensions.GLX_EXT_visual_rating = GLXQueryExtension(env, disp, screen, "GLX_EXT_visual_rating");
extgl_Extensions.GLX_SGI_swap_control = GLXQueryExtension(env, ext_set, disp, screen, "GLX_SGI_swap_control"); extgl_Extensions.GLX_SGI_swap_control = GLXQueryExtension(env, disp, screen, "GLX_SGI_swap_control");
extgl_Extensions.GLX_ARB_multisample = GLXQueryExtension(env, ext_set, disp, screen, "GLX_ARB_multisample"); extgl_Extensions.GLX_ARB_multisample = GLXQueryExtension(env, disp, screen, "GLX_ARB_multisample");
} }
static void extgl_InitGLXSGISwapControl(JNIEnv *env, jobject ext_set) static void extgl_InitGLXSGISwapControl(JNIEnv *env)
{ {
if (extgl_Extensions.GLX_SGI_swap_control != 1) if (extgl_Extensions.GLX_SGI_swap_control != 1)
return; return;
glXSwapIntervalSGI = (glXSwapIntervalSGIPROC)extgl_GetProcAddress("glXSwapIntervalSGI"); glXSwapIntervalSGI = (glXSwapIntervalSGIPROC)extgl_GetProcAddress("glXSwapIntervalSGI");
EXTGL_SANITY_CHECK(env, ext_set, GLX_SGI_swap_control) EXTGL_SANITY_CHECK(env, (jobject)NULL, GLX_SGI_swap_control);
} }
bool extgl_InitGLX(JNIEnv *env, jobject ext_set, Display *disp, int screen) bool extgl_InitGLX(JNIEnv *env, Display *disp, int screen)
{ {
int major, minor; int major, minor;
/* Assume glx ver >= 1.2 */ /* Assume glx ver >= 1.2 */
@ -1098,13 +1069,13 @@ bool extgl_InitGLX(JNIEnv *env, jobject ext_set, Display *disp, int screen)
return false; return false;
if (!extgl_InitGLX12()) if (!extgl_InitGLX12())
return false; return false;
extgl_InitGLXSupportedExtensions(env, ext_set, disp, screen); extgl_InitGLXSupportedExtensions(env, disp, screen);
if (glXQueryVersion(disp, &major, &minor) != True) if (glXQueryVersion(disp, &major, &minor) != True)
return false; return false;
if (major > 1 || (major == 1 && minor >= 3)) if (major > 1 || (major == 1 && minor >= 3))
extgl_Extensions.GLX13 = true; extgl_Extensions.GLX13 = true;
extgl_InitGLX13(env, ext_set); extgl_InitGLX13(env);
extgl_InitGLXSGISwapControl(env, ext_set); extgl_InitGLXSGISwapControl(env);
return true; return true;
} }
#endif #endif

2
src/native/common/extgl.h
View File

@ -3291,7 +3291,7 @@ void extgl_Close(void);
void extgl_removeExtension(JNIEnv *env, jobject ext_set, const char *ext); void extgl_removeExtension(JNIEnv *env, jobject ext_set, const char *ext);
#define EXTGL_SANITY_CHECK(e,h,x) if (extgl_error) { \ #define EXTGL_SANITY_CHECK(e,h,x) if (extgl_error) { \
extgl_Extensions.x = 0; \ extgl_Extensions.x = false; \
printf("NOTICE: %s disabled because of missing driver symbols\n", #x); \ printf("NOTICE: %s disabled because of missing driver symbols\n", #x); \
extgl_error = false; \ extgl_error = false; \
if (h != NULL) { \ if (h != NULL) { \

6
src/native/linux/org_lwjgl_opengl_Window.cpp
View File

@ -457,7 +457,7 @@ static bool initWindowGLX(JNIEnv *env, Display *disp, int screen, jstring title,
* Signature: (IIII)Z * Signature: (IIII)Z
*/ */
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Window_nCreate JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Window_nCreate
(JNIEnv * env, jclass clazz, jstring title, jint x, jint y, jint width, jint height, jboolean fullscreen, jint bpp, jint alpha, jint depth, jint stencil, jint samples, jobject ext_set) (JNIEnv * env, jclass clazz, jstring title, jint x, jint y, jint width, jint height, jboolean fullscreen, jint bpp, jint alpha, jint depth, jint stencil, jint samples)
{ {
int screen; int screen;
Display *disp; Display *disp;
@ -493,7 +493,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Window_nCreate
throwException(env, "Could not create window"); throwException(env, "Could not create window");
return; return;
} }
if (!extgl_Initialize(env, ext_set)) { /* if (!extgl_Initialize(env, ext_set)) {
destroy(); destroy();
throwException(env, "Could not init gl function pointers"); throwException(env, "Could not init gl function pointers");
return; return;
@ -501,7 +501,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Window_nCreate
if (ISDEBUGENABLED()) { if (ISDEBUGENABLED()) {
const GLubyte * extensions = glGetString(GL_EXTENSIONS); const GLubyte * extensions = glGetString(GL_EXTENSIONS);
printf("Supported extensions: %s\n", extensions); printf("Supported extensions: %s\n", extensions);
} }*/
} }
/* /*