fix quake2 build

glKarin · Dec 28, 2024 · b92ff55 · b92ff55
1 parent af95efa
commit b92ff55
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/.github/workflows/android.changelog b/.github/workflows/android.changelog
@@ -1 +1 @@
-z
+z2
diff --git a/Q3E/src/main/jni/quake2/yquake2/src/backends/android/gles.c b/Q3E/src/main/jni/quake2/yquake2/src/backends/android/gles.c
@@ -9,6 +9,7 @@
 
 // OpenGL attributes
 int gl_format = 0x8888;
+int gl_depth_bits = 24;
 int gl_msaa = 0;
 int screen_width = 640;
 int screen_height = 480;
@@ -61,11 +62,12 @@ void RI_SetResolution(int aw,int ah)
 	printf("[Harmattan]: RI_SetResolution(%d, %d).\n", aw, ah);
 }
 
-void RI_SetGLParms(int f, int msaa)
+void RI_SetGLParms(int f, int msaa, int depthBits)
 {
     gl_format = f;
     gl_msaa = msaa;
-	printf( "[Harmattan]: RI_SetGLParms(0x%X, %d).\n", gl_format, msaa);
+	gl_depth_bits = depthBits;
+	printf( "[Harmattan]: RI_SetGLParms(0x%X, %d, %d).\n", gl_format, gl_msaa, gl_depth_bits);
 }
 #pragma GCC visibility pop
 

diff --git a/Q3E/src/main/jni/quake2/yquake2/src/backends/android/gles3.c b/Q3E/src/main/jni/quake2/yquake2/src/backends/android/gles3.c
@@ -9,6 +9,7 @@
 
 // OpenGL attributes
 int gl_format = 0x8888;
+int gl_depth_bits = 24;
 int gl_msaa = 0;
 int screen_width = 640;
 int screen_height = 480;
@@ -61,11 +62,12 @@ void RI_SetResolution(int aw,int ah)
 	printf("[Harmattan]: RI_SetResolution(%d, %d).\n", aw, ah);
 }
 
-void RI_SetGLParms(int f, int msaa)
+void RI_SetGLParms(int f, int msaa, int depthBits)
 {
 	gl_format = f;
 	gl_msaa = msaa;
-	printf( "[Harmattan]: RI_SetGLParms(0x%X, %d).\n", gl_format, msaa);
+	gl_depth_bits = depthBits;
+	printf( "[Harmattan]: RI_SetGLParms(0x%X, %d, %d).\n", gl_format, gl_msaa, gl_depth_bits);
 }
 #pragma GCC visibility pop
 

diff --git a/Q3E/src/main/jni/quake2/yquake2/src/backends/android/glimp.c b/Q3E/src/main/jni/quake2/yquake2/src/backends/android/glimp.c
@@ -56,19 +56,20 @@ extern int screen_height;
 
 extern int gl_format;
 extern int gl_msaa;
+extern int gl_depth_bits;
 
 extern volatile ANativeWindow * Android_GetWindow(void);
 
 void (* GLref_AndroidInit)(volatile ANativeWindow *w);
 void (* GLref_AndroidQuit)(void);
-typedef void (*RI_SetGLParms)(int f, int msaa);
+typedef void (*RI_SetGLParms)(int f, int msaa, int depthBits);
 typedef void (*RI_SetResolution)(int aw,int ah);
 
 void GLimp_SetRef(void *init, void *quit, void *setGLParms, void *setResolution)
 {
     GLref_AndroidInit = init;
 	GLref_AndroidQuit = quit;
-    ((RI_SetGLParms)setGLParms)(gl_format, gl_msaa);
+    ((RI_SetGLParms)setGLParms)(gl_format, gl_msaa, gl_depth_bits);
 	((RI_SetResolution)setResolution)(screen_width, screen_height);
 }