From 050638760e57cc28d7ec6b96c465cc7cae1b2fac Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Sat, 15 Jul 2006 20:25:56 +0000 Subject: [PATCH] Windows: Don't use a non-portable anonymous struct in contex.h --- src/java/org/lwjgl/test/DisplayTest.java | 1 - src/native/windows/context.h | 2 +- src/native/windows/org_lwjgl_opengl_Pbuffer.c | 16 ++++++++-------- ...org_lwjgl_opengl_WindowsAWTGLCanvasPeerInfo.c | 2 +- .../org_lwjgl_opengl_WindowsDisplayPeerInfo.c | 4 ++-- 5 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/java/org/lwjgl/test/DisplayTest.java b/src/java/org/lwjgl/test/DisplayTest.java index c5eb6c9a..0b39e656 100644 --- a/src/java/org/lwjgl/test/DisplayTest.java +++ b/src/java/org/lwjgl/test/DisplayTest.java @@ -69,7 +69,6 @@ public class DisplayTest { System.out.println("Info about current:"); System.out.println("Graphics card: " + Display.getAdapter() + ", version: " + Display.getVersion()); -System.exit(1); System.out.println("Resolution: " + Display.getDisplayMode().getWidth() + "x" + Display.getDisplayMode().getHeight() + "x" + diff --git a/src/native/windows/context.h b/src/native/windows/context.h index 1bb838e5..ac7c64b7 100644 --- a/src/native/windows/context.h +++ b/src/native/windows/context.h @@ -55,7 +55,7 @@ typedef struct { // created the pbuffer WGLExtensions extensions; } pbuffer; - }; + } u; HDC format_hdc; HDC drawable_hdc; } WindowsPeerInfo; diff --git a/src/native/windows/org_lwjgl_opengl_Pbuffer.c b/src/native/windows/org_lwjgl_opengl_Pbuffer.c index 810e695a..e4131029 100644 --- a/src/native/windows/org_lwjgl_opengl_Pbuffer.c +++ b/src/native/windows/org_lwjgl_opengl_Pbuffer.c @@ -166,23 +166,23 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_WindowsPbufferPeerInfo_nCreate return; } peer_info->format_hdc = Pbuffer_dc; - peer_info->pbuffer.extensions = extensions; - peer_info->pbuffer.pbuffer = Pbuffer; + peer_info->u.pbuffer.extensions = extensions; + peer_info->u.pbuffer.pbuffer = Pbuffer; peer_info->drawable_hdc = Pbuffer_dc; } JNIEXPORT void JNICALL Java_org_lwjgl_opengl_WindowsPbufferPeerInfo_nDestroy (JNIEnv *env, jclass clazz, jobject peer_info_handle) { WindowsPeerInfo *peer_info = (WindowsPeerInfo *)(*env)->GetDirectBufferAddress(env, peer_info_handle); - peer_info->pbuffer.extensions.wglReleasePbufferDCARB(peer_info->pbuffer.pbuffer, peer_info->drawable_hdc); - peer_info->pbuffer.extensions.wglDestroyPbufferARB(peer_info->pbuffer.pbuffer); + peer_info->u.pbuffer.extensions.wglReleasePbufferDCARB(peer_info->u.pbuffer.pbuffer, peer_info->drawable_hdc); + peer_info->u.pbuffer.extensions.wglDestroyPbufferARB(peer_info->u.pbuffer.pbuffer); } JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_WindowsPbufferPeerInfo_nIsBufferLost (JNIEnv *env, jclass clazz, jobject peer_info_handle) { WindowsPeerInfo *peer_info = (WindowsPeerInfo *)(*env)->GetDirectBufferAddress(env, peer_info_handle); BOOL buffer_lost; - peer_info->pbuffer.extensions.wglQueryPbufferARB(peer_info->pbuffer.pbuffer, WGL_PBUFFER_LOST_ARB, &buffer_lost); + peer_info->u.pbuffer.extensions.wglQueryPbufferARB(peer_info->u.pbuffer.pbuffer, WGL_PBUFFER_LOST_ARB, &buffer_lost); return buffer_lost ? JNI_TRUE : JNI_FALSE; } @@ -195,17 +195,17 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_WindowsPbufferPeerInfo_nSetPbufferA attribs[1] = value; attribs[2] = 0; - peer_info->pbuffer.extensions.wglSetPbufferAttribARB(peer_info->pbuffer.pbuffer, attribs); + peer_info->u.pbuffer.extensions.wglSetPbufferAttribARB(peer_info->u.pbuffer.pbuffer, attribs); } JNIEXPORT void JNICALL Java_org_lwjgl_opengl_WindowsPbufferPeerInfo_nBindTexImageToPbuffer (JNIEnv *env, jclass clazz, jobject peer_info_handle, jint buffer) { WindowsPeerInfo *peer_info = (WindowsPeerInfo *)(*env)->GetDirectBufferAddress(env, peer_info_handle); - peer_info->pbuffer.extensions.wglBindTexImageARB(peer_info->pbuffer.pbuffer, buffer); + peer_info->u.pbuffer.extensions.wglBindTexImageARB(peer_info->u.pbuffer.pbuffer, buffer); } JNIEXPORT void JNICALL Java_org_lwjgl_opengl_WindowsPbufferPeerInfo_nReleaseTexImageFromPbuffer (JNIEnv *env, jclass clazz, jobject peer_info_handle, jint buffer) { WindowsPeerInfo *peer_info = (WindowsPeerInfo *)(*env)->GetDirectBufferAddress(env, peer_info_handle); - peer_info->pbuffer.extensions.wglReleaseTexImageARB(peer_info->pbuffer.pbuffer, buffer); + peer_info->u.pbuffer.extensions.wglReleaseTexImageARB(peer_info->u.pbuffer.pbuffer, buffer); } diff --git a/src/native/windows/org_lwjgl_opengl_WindowsAWTGLCanvasPeerInfo.c b/src/native/windows/org_lwjgl_opengl_WindowsAWTGLCanvasPeerInfo.c index 00551a36..14ae9b80 100644 --- a/src/native/windows/org_lwjgl_opengl_WindowsAWTGLCanvasPeerInfo.c +++ b/src/native/windows/org_lwjgl_opengl_WindowsAWTGLCanvasPeerInfo.c @@ -50,7 +50,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_WindowsAWTGLCanvasPeerInfo_nInitHan WindowsPeerInfo *peer_info = (WindowsPeerInfo *)(*env)->GetDirectBufferAddress(env, peer_info_handle); AWTSurfaceLock *surface = (AWTSurfaceLock *)(*env)->GetDirectBufferAddress(env, lock_buffer_handle); JAWT_Win32DrawingSurfaceInfo *win32_dsi = (JAWT_Win32DrawingSurfaceInfo *)surface->dsi->platformInfo; - peer_info->format_hwnd = win32_dsi->hwnd; + peer_info->u.format_hwnd = win32_dsi->hwnd; peer_info->format_hdc = win32_dsi->hdc; peer_info->drawable_hdc = win32_dsi->hdc; } diff --git a/src/native/windows/org_lwjgl_opengl_WindowsDisplayPeerInfo.c b/src/native/windows/org_lwjgl_opengl_WindowsDisplayPeerInfo.c index c96adcf6..328a4505 100644 --- a/src/native/windows/org_lwjgl_opengl_WindowsDisplayPeerInfo.c +++ b/src/native/windows/org_lwjgl_opengl_WindowsDisplayPeerInfo.c @@ -53,14 +53,14 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_WindowsDisplayPeerInfo_createDummyD return; } dummy_hdc = GetDC(dummy_hwnd); - peer_info->format_hwnd = dummy_hwnd; + peer_info->u.format_hwnd = dummy_hwnd; peer_info->format_hdc = dummy_hdc; } JNIEXPORT void JNICALL Java_org_lwjgl_opengl_WindowsDisplayPeerInfo_nDestroy (JNIEnv *env, jclass clazz, jobject peer_info_handle) { WindowsPeerInfo *peer_info = (WindowsPeerInfo *)(*env)->GetDirectBufferAddress(env, peer_info_handle); - closeWindow(&peer_info->format_hwnd, &peer_info->format_hdc); + closeWindow(&peer_info->u.format_hwnd, &peer_info->format_hdc); } JNIEXPORT void JNICALL Java_org_lwjgl_opengl_WindowsDisplayPeerInfo_nInitDC