Update of /cvsroot/java-game-lib/LWJGL/src/native/linux
In directory sc8-pr-cvs1:/tmp/cvs-serv17077/src/native/linux
Modified Files:
org_lwjgl_Display.cpp org_lwjgl_opengl_BaseGL.cpp
Log Message:
Moved BaseGL constructor parameters to Display
Index: org_lwjgl_Display.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/linux/org_lwjgl_Display.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_Display.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- org_lwjgl_Display.cpp 11 Dec 2002 07:26:49 -0000 1.8
+++ org_lwjgl_Display.cpp 19 Dec 2002 16:35:35 -0000 1.9
@@ -96,28 +96,43 @@
return 1;
}
-JNIEXPORT jboolean JNICALL Java_org_lwjgl_Display_nCreate(JNIEnv * env, jclass clazz, jint width, jint height, jint bpp, jint freq, jboolean fullscreen) {
+JNIEXPORT jboolean JNICALL Java_org_lwjgl_Display_nCreate(JNIEnv * env, jclass clazz, jint width, jint height, jint bpp, jint freq, jint alpha_bits, jint depth_bits, jint stencil_bits, jboolean fullscreen) {
Window root_win;
XSetWindowAttributes attribs;
Colormap cmap;
int attribmask;
- int bpe = bpp/4;
+ int bpe;
+ switch (bpp) {
+ case 32:
+ case 24:
+ bpe = 8;
+ break;
+ case 16:
+ bpe = 4;
+ break;
+ default:
+ return JNI_FALSE;
+ }
+ if (depth_bits == 32)
+ depth_bits = 24;
+
int attriblist[] = { GLX_RGBA,
GLX_DOUBLEBUFFER,
- GLX_DEPTH_SIZE, bpp,
+ GLX_DEPTH_SIZE, depth_bits,
GLX_RED_SIZE, bpe,
GLX_GREEN_SIZE, bpe,
GLX_BLUE_SIZE, bpe,
- GLX_ALPHA_SIZE, bpe,
+ GLX_ALPHA_SIZE, alpha_bits,
+ GLX_STENCIL_SIZE, stencil_bits,
None };
- int attriblistna[] = { GLX_RGBA,
+/* int attriblistna[] = { GLX_RGBA,
GLX_DOUBLEBUFFER,
GLX_DEPTH_SIZE, bpp,
GLX_RED_SIZE, bpe,
GLX_GREEN_SIZE, bpe,
GLX_BLUE_SIZE, bpe,
None };
-
+*/
int num_modes, i;
@@ -151,10 +166,10 @@
vis_info = glXChooseVisual(disp, screen, attriblist);
/* might be a better way to handle not being able to set GLX_ALPHA_SIZE... */
- if (vis_info == NULL) {
+/* if (vis_info == NULL) {
vis_info = glXChooseVisual(disp, screen, attriblistna);
}
-
+*/
if (vis_info == NULL) {
XCloseDisplay(disp);
#ifdef _DEBUG
Index: org_lwjgl_opengl_BaseGL.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/linux/org_lwjgl_opengl_BaseGL.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_opengl_BaseGL.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_opengl_BaseGL.cpp 25 Nov 2002 20:35:01 -0000 1.4
+++ org_lwjgl_opengl_BaseGL.cpp 19 Dec 2002 16:35:35 -0000 1.5
@@ -61,7 +61,7 @@
* Signature: (IIII)Z
*/
JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_BaseGL_nCreate
- (JNIEnv * env, jobject obj, jint colorBits, jint alphaBits, jint depthBits, jint stencilBits)
+ (JNIEnv * env, jobject obj)
{
if (!vis_info) {
|
