[cadcdev-svn-commits] [SCM] branch master updated. 4c8c082e0675162a1482a810210dec6d4202dc3e

[ljsebald <ljs...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The KallistiOS port of OpenGL.".

The branch, master has been updated
       via  4c8c082e0675162a1482a810210dec6d4202dc3e (commit)
      from  07f346a758576af2b58e18bd0c139c2f5249407e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4c8c082e0675162a1482a810210dec6d4202dc3e
Author: Lawrence Sebald <ljs...@us...>
Date:   Fri Dec 29 17:53:04 2023 -0500

    Fix SQ code for changes to KOS.

-----------------------------------------------------------------------

Summary of changes:
 gl-pvr.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/gl-pvr.c b/gl-pvr.c
index 2898b34..1d13460 100644
--- a/gl-pvr.c
+++ b/gl-pvr.c
@@ -2,7 +2,7 @@
 
    libgl/gl-pvr.c
    Copyright (C) 2013-2014 Josh Pearson
-   Copyright (C) 2016 Lawrence Sebald
+   Copyright (C) 2016, 2023 Lawrence Sebald
 
    Vertex Buffer Routines for interfacing the Dreamcast's SH4 CPU and PowerVR GPU.
 
@@ -53,6 +53,7 @@ static GLuint GL_VERTS[2] = {0, 0},
 static GL_MULTITEX_OBJECT GL_MTOBJS[GL_KOS_MAX_MULTITEXTURE_OBJECTS];
 static GLuint             GL_MTOBJECTS = 0;
 
+#if 0
 /* Custom version of sq_cpy from KOS for copying vertex data to the PVR */
 static inline void pvr_list_submit(void *src, int n) {
     GLuint *d = TA_SQ_ADDR;
@@ -93,6 +94,12 @@ static inline void pvr_hdr_submit(const GLuint *src) {
 
     asm("pref @%0" : : "r"(d));
 }
+#else
+
+#define pvr_list_submit(src, n) sq_cpy(TA_SQ_ADDR, (src), ((n) << 5))
+#define pvr_hdr_submit(src) sq_cpy(TA_SQ_ADDR, (src), 32)
+
+#endif
 
 inline void _glKosPushMultiTexObject(GL_TEXTURE_OBJECT *tex,
                                      pvr_vertex_t *src,
@@ -205,8 +212,10 @@ inline void _glKosVertexBufCopy(void *dst, void *src, GLuint count) {
 
 static inline void glutSwapBuffer() {
 #ifndef GL_KOS_USE_DMA
+#if 0
     QACR0 = QACRTA;
     QACR1 = QACRTA;
+#endif
 #endif
 
     pvr_list_begin(PVR_LIST_OP_POLY);


hooks/post-receive
-- 
The KallistiOS port of OpenGL.