Windows: Don't use a non-portable anonymous struct in contex.h
This commit is contained in:
parent
5e012ce2e1
commit
050638760e
|
@ -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" +
|
||||
|
|
|
@ -55,7 +55,7 @@ typedef struct {
|
|||
// created the pbuffer
|
||||
WGLExtensions extensions;
|
||||
} pbuffer;
|
||||
};
|
||||
} u;
|
||||
HDC format_hdc;
|
||||
HDC drawable_hdc;
|
||||
} WindowsPeerInfo;
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue