java-game-lib-cvs Mailing List for Lightweight Java Game Library

Update of /cvsroot/java-game-lib/LWJGL/src/native/win32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22067/src/native/win32

Modified Files:
	Window.h org_lwjgl_opengl_Display.cpp 
	org_lwjgl_opengl_Pbuffer.cpp 
Log Message:
Removed shared context ability from Pbuffer (win32)

Index: org_lwjgl_opengl_Display.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_opengl_Display.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- org_lwjgl_opengl_Display.cpp	28 Jul 2004 22:26:29 -0000	1.20
+++ org_lwjgl_opengl_Display.cpp	2 Aug 2004 14:47:52 -0000	1.21
@@ -85,14 +85,6 @@
 	return display_hglrc;
 }
 
-HDC getCurrentWindowDC() {
-	return display_hdc;
-}
-
-int getCurrentPixelFormat() {
-	return pixel_format_index;
-}
-
 static int findPixelFormatARBFromBPP(JNIEnv *env, HDC hdc, jobject pixel_format, jobject pixelFormatCaps, int bpp, bool window, bool pbuffer, bool double_buffer) {
 	jclass cls_pixel_format = env->GetObjectClass(pixel_format);
 	int alpha = (int)env->GetIntField(pixel_format, env->GetFieldID(cls_pixel_format, "alpha", "I"));
@@ -708,20 +700,22 @@
 		return;
 	}
 	extgl_InitWGL(env);
-	int pixel_format_index_arb;
-	HGLRC context_arb;
-	bool arb_success = createARBContextAndPixelFormat(env, dummy_hdc, pixel_format, &pixel_format_index_arb, &context_arb);
-	closeWindow(dummy_hwnd, dummy_hdc);
 	jclass cls_pixel_format = env->GetObjectClass(pixel_format);
 	int samples = (int)env->GetIntField(pixel_format, env->GetFieldID(cls_pixel_format, "samples", "I"));
-	if (arb_success) {
+	if (samples > 0) {
+		int pixel_format_index_arb;
+		HGLRC context_arb;
+		bool arb_success = createARBContextAndPixelFormat(env, dummy_hdc, pixel_format, &pixel_format_index_arb, &context_arb);
+		closeWindow(dummy_hwnd, dummy_hdc);
 		wglDeleteContext(display_hglrc);
+		if (!arb_success) {
+			throwException(env, "Samples > 0 but could not find a suitable ARB pixel format");
+			return;
+		}
 		display_hglrc = context_arb;
 		pixel_format_index = pixel_format_index_arb;
-	} else if (samples > 0) {
-		wglDeleteContext(display_hglrc);
-		throwException(env, "Samples > 0 but could not find a suitable ARB pixel format");
-	}
+	} else
+		closeWindow(dummy_hwnd, dummy_hdc);
 }
 
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Display_destroyContext(JNIEnv *env, jclass clazz) {

Index: Window.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/Window.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Window.h	26 Jul 2004 17:01:54 -0000	1.16
+++ Window.h	2 Aug 2004 14:47:52 -0000	1.17
@@ -60,12 +60,8 @@
 
 	WINDOW_H_API HWND getCurrentHWND();
 
-	WINDOW_H_API HDC getCurrentWindowDC();
-
 	WINDOW_H_API HGLRC getCurrentContext();
 
-	WINDOW_H_API int getCurrentPixelFormat();
-
 	WINDOW_H_API bool applyPixelFormat(HDC hdc, int iPixelFormat);
 
 	WINDOW_H_API void closeWindow(HWND hwnd, HDC hdc);

Index: org_lwjgl_opengl_Pbuffer.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_opengl_Pbuffer.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- org_lwjgl_opengl_Pbuffer.cpp	26 Jul 2004 19:37:43 -0000	1.19
+++ org_lwjgl_opengl_Pbuffer.cpp	2 Aug 2004 14:47:52 -0000	1.20
@@ -52,7 +52,6 @@
 	HGLRC Pbuffer_context;
 	HPBUFFERARB Pbuffer;
 	HDC Pbuffer_dc;
-	bool use_display_context;
 } PbufferInfo;
 
 /*
@@ -140,7 +139,7 @@
 }
 
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Pbuffer_nCreate
-  (JNIEnv *env, jclass clazz, jobject buffer_handle, jboolean use_display_context,
+  (JNIEnv *env, jclass clazz, jobject buffer_handle,
   jint width, jint height, jobject pixel_format,
   jobject pixelFormatCaps, jobject pBufferAttribs)
 {
@@ -155,12 +154,7 @@
 	} else {
 		pBufferAttribs_ptr = NULL;
 	}
-	if (use_display_context) {
-		int iPixelFormat = getCurrentPixelFormat();
-		Pbuffer = wglCreatePbufferARB(getCurrentWindowDC(), iPixelFormat, width, height, pBufferAttribs_ptr);
-	} else {
-		Pbuffer = createPbuffer(env, width, height, pixel_format, pixelFormatCaps, pBufferAttribs_ptr);
-	}
+	Pbuffer = createPbuffer(env, width, height, pixel_format, pixelFormatCaps, pBufferAttribs_ptr);
 
 	if (Pbuffer == NULL) {
 		throwException(env, "Could not create Pbuffer.");
@@ -174,22 +168,16 @@
 		return;
 	}
 	HGLRC Pbuffer_context;
-	if (use_display_context) {
-		Pbuffer_context = getCurrentContext();
-	} else {
-		Pbuffer_context = createPbufferContext(env, Pbuffer_dc);
-		if (Pbuffer_context == NULL) {
-			wglReleasePbufferDCARB(Pbuffer, Pbuffer_dc);
-			wglDestroyPbufferARB(Pbuffer);
-			return;
-		}
+	Pbuffer_context = createPbufferContext(env, Pbuffer_dc);
+	if (Pbuffer_context == NULL) {
+		wglReleasePbufferDCARB(Pbuffer, Pbuffer_dc);
+		wglDestroyPbufferARB(Pbuffer);
+		return;
 	}
-
 	PbufferInfo *Pbuffer_info = (PbufferInfo *)env->GetDirectBufferAddress(buffer_handle);
 	Pbuffer_info->Pbuffer = Pbuffer;
 	Pbuffer_info->Pbuffer_context = Pbuffer_context;
 	Pbuffer_info->Pbuffer_dc = Pbuffer_dc;
-	Pbuffer_info->use_display_context = use_display_context == JNI_TRUE;
 }
 
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_Pbuffer_nIsBufferLost
@@ -214,8 +202,7 @@
   (JNIEnv *env, jclass clazz, jobject buffer_handle)
 {
 	PbufferInfo *Pbuffer_info = (PbufferInfo *)env->GetDirectBufferAddress(buffer_handle);
-	if (!Pbuffer_info->use_display_context)
-		wglDeleteContext(Pbuffer_info->Pbuffer_context);
+	wglDeleteContext(Pbuffer_info->Pbuffer_context);
 	wglReleasePbufferDCARB(Pbuffer_info->Pbuffer, Pbuffer_info->Pbuffer_dc);
 	wglDestroyPbufferARB(Pbuffer_info->Pbuffer);
 }

Update of /cvsroot/java-game-lib/LWJGL/src/native/linux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19542/src/native/linux

Modified Files:
	org_lwjgl_opengl_Display.cpp org_lwjgl_opengl_Pbuffer.cpp 
Log Message:
Removed ability to share Display context in Pbuffer - it was too much trouble for little gain

Index: org_lwjgl_opengl_Display.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_opengl_Display.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- org_lwjgl_opengl_Display.cpp	30 Jul 2004 13:58:08 -0000	1.14
+++ org_lwjgl_opengl_Display.cpp	2 Aug 2004 14:32:51 -0000	1.15
@@ -535,13 +535,10 @@
 }
 
 static bool initWindowGLX13(JNIEnv *env, jobject pixel_format) {
-	configs = chooseVisualGLX13(env, pixel_format, true, GLX_WINDOW_BIT | GLX_PBUFFER_BIT, true);
+	configs = chooseVisualGLX13(env, pixel_format, true, GLX_WINDOW_BIT, true);
 	if (configs == NULL) {
-		configs = chooseVisualGLX13(env, pixel_format, true, GLX_WINDOW_BIT, true);
-		if (configs == NULL) {
-			throwException(env, "Could not find a matching pixel format");
-			return false;
-		}
+		throwException(env, "Could not find a matching pixel format");
+		return false;
 	}
 	context = glXCreateNewContext(getDisplay(), configs[0], GLX_RGBA_TYPE, NULL, True);
 	if (context == NULL) {

Index: org_lwjgl_opengl_Pbuffer.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_opengl_Pbuffer.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- org_lwjgl_opengl_Pbuffer.cpp	30 Jul 2004 13:30:15 -0000	1.27
+++ org_lwjgl_opengl_Pbuffer.cpp	2 Aug 2004 14:32:51 -0000	1.28
@@ -48,7 +48,6 @@
 typedef struct _PbufferInfo {
 	GLXPbuffer buffer;
 	GLXContext context;
-	bool use_display_context;
 } PbufferInfo;
 
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_Pbuffer_nIsBufferLost
@@ -69,8 +68,7 @@
 	GLXPbuffer buffer = buffer_info->buffer;
 	GLXContext context = buffer_info->context;
 	glXDestroyPbuffer(getDisplay(), buffer);
-	if (!buffer_info->use_display_context)
-		glXDestroyContext(getDisplay(), context);
+	glXDestroyContext(getDisplay(), context);
 	decDisplay();
 }
 
@@ -100,11 +98,8 @@
 static bool createPbufferUsingUniqueContext(JNIEnv *env, PbufferInfo *pbuffer_info, jobject pixel_format, int width, int height, const int *buffer_attribs) {
 	GLXFBConfig *configs = chooseVisualGLX13(env, pixel_format, false, GLX_PBUFFER_BIT, false);
 	if (configs == NULL) {
-		GLXFBConfig *configs = chooseVisualGLX13(env, pixel_format, false, GLX_PBUFFER_BIT, true);
-		if (configs == NULL) {
-			throwException(env, "No matching pixel format");
-			return false;
-		}
+		throwException(env, "No matching pixel format");
+		return false;
 	}
 	if (!checkPbufferCaps(env, configs[0], width, height)) {
 		XFree(configs);
@@ -174,29 +169,7 @@
 	return NULL;
 }
 
-static bool createPbufferUsingDisplayContext(JNIEnv *env, PbufferInfo *buffer_info, int width, int height, const int *buffer_attribs) {
-	if (!checkPbufferCaps(env, getCurrentGLXFBConfig(), width, height)) {
-		return false;
-	}
-	int drawable_type;
-	if (glXGetFBConfigAttrib(getDisplay(), getCurrentGLXFBConfig(), GLX_DRAWABLE_TYPE, &drawable_type) != Success) {
-		throwException(env, "Could not get GLX_DRAWABLE_TYPE attribute from Display context");
-		return false;
-	}
-	if (drawable_type & GLX_PBUFFER_BIT == 0) {
-		throwException(env, "Display context does not support Pbuffers");
-		return false;
-	}
-	GLXFBConfig config = chooseSingleBufferedConfigFromConfig(getCurrentGLXFBConfig());
-	if (config == NULL)
-		config = getCurrentGLXFBConfig();
-	GLXPbuffer buffer = glXCreatePbuffer(getDisplay(), config, buffer_attribs);
-	buffer_info->buffer = buffer;
-	buffer_info->context = getCurrentGLXContext();
-	return true;
-}
-
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Pbuffer_nCreate(JNIEnv *env, jclass clazz, jobject handle_buffer, jboolean use_display_context, jint width, jint height, jobject pixel_format, jobject pixelFormatCaps, jobject pBufferAttribs)
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Pbuffer_nCreate(JNIEnv *env, jclass clazz, jobject handle_buffer, jint width, jint height, jobject pixel_format, jobject pixelFormatCaps, jobject pBufferAttribs)
 {
 	Display *disp = incDisplay(env);
 	if (disp == NULL) {
@@ -221,13 +194,8 @@
 		return;
 	}
 	PbufferInfo *buffer_info = (PbufferInfo *)env->GetDirectBufferAddress(handle_buffer);
-	buffer_info->use_display_context = use_display_context;
 	bool result;
-	if (use_display_context) {
-		result = createPbufferUsingDisplayContext(env, buffer_info, width, height, buffer_attribs);
-	} else {
-		result = createPbufferUsingUniqueContext(env, buffer_info, pixel_format, width, height, buffer_attribs);
-	}
+	result = createPbufferUsingUniqueContext(env, buffer_info, pixel_format, width, height, buffer_attribs);
 	if (!result || !checkXError(env)) {
 		decDisplay();
 		destroyPbuffer(buffer_info);

Update of /cvsroot/java-game-lib/LWJGL/src/native/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19542/src/native/common

Modified Files:
	org_lwjgl_opengl_Pbuffer.h 
Log Message:
Removed ability to share Display context in Pbuffer - it was too much trouble for little gain

Index: org_lwjgl_opengl_Pbuffer.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_Pbuffer.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- org_lwjgl_opengl_Pbuffer.h	25 Jul 2004 14:28:50 -0000	1.10
+++ org_lwjgl_opengl_Pbuffer.h	2 Aug 2004 14:32:51 -0000	1.11
@@ -70,10 +70,10 @@
 /*
  * Class:     org_lwjgl_opengl_Pbuffer
  * Method:    nCreate
- * Signature: (Ljava/nio/ByteBuffer;ZIILorg/lwjgl/opengl/PixelFormat;Ljava/nio/IntBuffer;Ljava/nio/IntBuffer;)V
+ * Signature: (Ljava/nio/ByteBuffer;IILorg/lwjgl/opengl/PixelFormat;Ljava/nio/IntBuffer;Ljava/nio/IntBuffer;)V
  */
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Pbuffer_nCreate
-  (JNIEnv *, jclass, jobject, jboolean, jint, jint, jobject, jobject, jobject);
+  (JNIEnv *, jclass, jobject, jint, jint, jobject, jobject, jobject);
 
 /*
  * Class:     org_lwjgl_opengl_Pbuffer

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/opengl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19542/src/java/org/lwjgl/test/opengl

Modified Files:
	PbufferTest.java 
Log Message:
Removed ability to share Display context in Pbuffer - it was too much trouble for little gain

Index: PbufferTest.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/opengl/PbufferTest.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- PbufferTest.java	24 Jul 2004 19:44:40 -0000	1.38
+++ PbufferTest.java	2 Aug 2004 14:32:51 -0000	1.39
@@ -96,7 +96,7 @@
   private void initialize() {
     try {
       //find displaymode
-      pbuffer = Pbuffer.createPbufferUsingUniqueContext(512, 512, new PixelFormat(), null);
+      pbuffer = new Pbuffer(512, 512, new PixelFormat(), null);
       mode = findDisplayMode(800, 600, 16);
       Display.setDisplayMode(mode);
       // start of in windowed mode
@@ -176,7 +176,7 @@
         System.out.println("Buffer contents lost - will recreate the buffer");
         pbuffer.destroy();
 	try {
-	        pbuffer = Pbuffer.createPbufferUsingUniqueContext(512, 512, new PixelFormat(), null);
+	        pbuffer = new Pbuffer(512, 512, new PixelFormat(), null);
         	initPbuffer();
 	} catch (LWJGLException e) {
 		e.printStackTrace();

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19542/src/java/org/lwjgl/opengl

Modified Files:
	Pbuffer.java 
Log Message:
Removed ability to share Display context in Pbuffer - it was too much trouble for little gain

Index: Pbuffer.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/Pbuffer.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- Pbuffer.java	29 Jul 2004 15:45:45 -0000	1.29
+++ Pbuffer.java	2 Aug 2004 14:32:50 -0000	1.30
@@ -156,46 +156,12 @@
 	 */
 	private final int height;
 
-	/*
-	 * The Display context that this buffer shares or null
-	 */
-	private final Object display_context;
-
 	static {
 		Sys.initialize();
 	}
 
 	/**
-	 * Determine whether the Pbuffer is using the Display context.
-	 *
-	 * @return true of the Pbuffer is using the Display context, false if not.
-	 */
-	public boolean isUsingDisplayContext() {
-		return display_context != null;
-	}
-
-	/**
-	 * Create an instance of a Pbuffer using the Display context. The buffer is single-buffered if possible.
-	 * <p/>
-	 * NOTE: The Pbuffer will use the same context as the Display and requires that the Display has been created. Therefore,
-	 * no separate pixel format can be specified. All OpenGL state,
-	 * including display lists, textures etc. is shared between the Pbuffer and the Display. If the Display is destroyed,
-	 * the Pbuffer will not be usable, even if the Display is created again.
-	 * <p/>
-	 * This kind of Pbuffer is the fastest, because the context switch overhead is minimum.
-	 * 
-	 * @param width         Pbuffer width
-	 * @param height        Pbuffer height
-	 */
-	public static Pbuffer createPbufferUsingDisplayContext(int width, int height, RenderTexture renderTexture) throws LWJGLException {
-		if (!Display.isCreated())
-			throw new IllegalStateException("The Display must be created before a shared Pbuffer can be created that use the Display context");
-		ByteBuffer handle = createPbuffer(true, width, height, null, renderTexture);
-		return new Pbuffer(width, height, Display.getContext(), handle);
-	}
-
-	/**
-	 * Create an instance of a Pbuffer with a unique OpenGL context. The buffer is single-buffered if possible.
+	 * Create an instance of a Pbuffer with a unique OpenGL context. The buffer is single-buffered.
 	 * <p/>
 	 * NOTE: The Pbuffer will have its own context that shares display lists and textures with the Display context (if it is created),
 	 * but it will have its own OpenGL state. Therefore, state changes to a pbuffer will not be seen in the window context and vice versa.
@@ -212,26 +178,20 @@
 	 * @param pixel_format  Minimum Pbuffer context properties
 	 * @param renderTexture
 	 */
-	public static Pbuffer createPbufferUsingUniqueContext(int width, int height, PixelFormat pixel_format, RenderTexture renderTexture) throws LWJGLException {
-		ByteBuffer handle = createPbuffer(false, width, height, pixel_format, renderTexture);
-		return new Pbuffer(width, height, null, handle);
-	}
-
-	private Pbuffer(int width, int height, Object display_context, ByteBuffer handle) {
+	public Pbuffer(int width, int height, PixelFormat pixel_format, RenderTexture renderTexture) throws LWJGLException {
 		this.width = width;
 		this.height = height;
-		this.display_context = display_context;
-		this.handle = handle;
+		this.handle = createPbuffer(width, height, pixel_format, renderTexture);
 	}
 
-	private static ByteBuffer createPbuffer(boolean use_display_context, int width, int height, PixelFormat pixel_format, RenderTexture renderTexture) throws LWJGLException {
+	private static ByteBuffer createPbuffer(int width, int height, PixelFormat pixel_format, RenderTexture renderTexture) throws LWJGLException {
 		GLContext.loadOpenGLLibrary();
 		try {
 			ByteBuffer handle = BufferUtils.createByteBuffer(HANDLE_SIZE);
 			if ( renderTexture == null )
-				nCreate(handle, use_display_context, width, height, pixel_format, null, null);
+				nCreate(handle, width, height, pixel_format, null, null);
 			else
-				nCreate(handle, use_display_context, width, height, pixel_format,
+				nCreate(handle, width, height, pixel_format,
 								renderTexture.pixelFormatCaps,
 								renderTexture.pBufferAttribs);
 			return handle;
@@ -262,11 +222,8 @@
 	 * @throws LWJGLException if the context could not be made current
 	 */
 	public void makeCurrent() throws LWJGLException {
-		if (display_context != null && display_context != Display.getContext())
-			throw new IllegalStateException("Cannot make a Pbuffer current after the Display has been destroyed");
 		nMakeCurrent(handle);
-		if (display_context == null)
-			GLContext.useContext(this);
+		GLContext.useContext(this);
 	}
 
 	/**
@@ -284,7 +241,7 @@
 	/**
 	 * Native method to create a Pbuffer
 	 */
-	private static native void nCreate(ByteBuffer handle, boolean shared, int width, int height, PixelFormat pixel_format,
+	private static native void nCreate(ByteBuffer handle, int width, int height, PixelFormat pixel_format,
 	                                  IntBuffer pixelFormatCaps,
 	                                  IntBuffer pBufferAttribs) throws LWJGLException;