Menu
▾
▴
[cadcdev-svn-commits] [SCM] branch master updated. c1cb580581d86fa0ed5cef83706e136bd540617f
|
From: kosmirror <kos...@us...> - 2025-07-23 13:54:20
|
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 "A pseudo Operating System for the Dreamcast.".
The branch, master has been updated
via c1cb580581d86fa0ed5cef83706e136bd540617f (commit)
via d0aa287d71c37a265f0c4a49496aef07bc77f424 (commit)
from f90f0f4b4df1828d16bf558799a627cb126d92a6 (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 c1cb580581d86fa0ed5cef83706e136bd540617f
Author: Paul Cercueil <pa...@cr...>
Date: Tue Jul 22 22:23:27 2025 +0200
pvr: Use to_pvr_txr_ptr() to factorize code
Use to_pvr_txr_ptr() where it makes sense to factorize code.
Signed-off-by: Paul Cercueil <pa...@cr...>
commit d0aa287d71c37a265f0c4a49496aef07bc77f424
Author: Paul Cercueil <pa...@cr...>
Date: Tue Jul 22 22:21:49 2025 +0200
pvr: Limit texture address to VRAM size in to_pvr_txr_ptr()
The previous commit f2513c1e1 ("pvr: Limit texture address to VRAM
size") missed one instance, the one in to_pvr_txr_ptr().
Signed-off-by: Paul Cercueil <pa...@cr...>
-----------------------------------------------------------------------
Summary of changes:
kernel/arch/dreamcast/hardware/pvr/pvr_prim.c | 30 +++++++++++------------
kernel/arch/dreamcast/include/dc/pvr/pvr_header.h | 4 ++-
2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/kernel/arch/dreamcast/hardware/pvr/pvr_prim.c b/kernel/arch/dreamcast/hardware/pvr/pvr_prim.c
index 3af1f0a3..a7460a4e 100644
--- a/kernel/arch/dreamcast/hardware/pvr/pvr_prim.c
+++ b/kernel/arch/dreamcast/hardware/pvr/pvr_prim.c
@@ -22,7 +22,8 @@
/* Compile a polygon context into a polygon header */
void pvr_poly_compile(pvr_poly_hdr_t *dst, const pvr_poly_cxt_t *src) {
- uint32_t txr_base, cmd;
+ pvr_txr_ptr_t txr_base;
+ uint32_t cmd;
/* Temporary variables we can read-write-modify, since we cannot do so from
within the SQs, and we want to be able to compile this header from a PVR
DR API submission target. */
@@ -81,13 +82,12 @@ void pvr_poly_compile(pvr_poly_hdr_t *dst, const pvr_poly_cxt_t *src) {
| FIELD_PREP(PVR_TA_PM2_VSIZE, __builtin_ctz(src->txr.height) - 3);
/* Convert the texture address */
- txr_base = (uint32_t)src->txr.base;
- txr_base = (txr_base & (PVR_RAM_SIZE - 1)) >> 3;
+ txr_base = to_pvr_txr_ptr(src->txr.base);
/* Polygon mode 3 */
mode3 = FIELD_PREP(PVR_TA_PM3_MIPMAP, src->txr.mipmap)
| src->txr.format
- | txr_base;
+ | (uint32_t)txr_base;
}
dst->mode2 = mode2;
@@ -266,7 +266,8 @@ void pvr_sprite_cxt_txr(pvr_sprite_cxt_t *dst, pvr_list_t list,
}
void pvr_sprite_compile(pvr_sprite_hdr_t *dst, const pvr_sprite_cxt_t *src) {
- uint32_t txr_base, cmd, mode2, mode3;
+ uint32_t cmd, mode2, mode3;
+ pvr_txr_ptr_t txr_base;
/* Basically we just take each parameter, clip it, shift it
into place, and OR it into the final result. */
@@ -317,13 +318,12 @@ void pvr_sprite_compile(pvr_sprite_hdr_t *dst, const pvr_sprite_cxt_t *src) {
| FIELD_PREP(PVR_TA_PM2_VSIZE, __builtin_ctz(src->txr.height) - 3);
/* Convert the texture address */
- txr_base = (uint32_t)src->txr.base;
- txr_base = (txr_base & (PVR_RAM_SIZE - 1)) >> 3;
+ txr_base = to_pvr_txr_ptr(src->txr.base);
/* Polygon mode 3 */
mode3 = FIELD_PREP(PVR_TA_PM3_MIPMAP, src->txr.mipmap)
| src->txr.format
- | txr_base;
+ | (uint32_t)txr_base;
}
dst->mode2 = mode2;
@@ -351,8 +351,8 @@ void pvr_mod_compile(pvr_mod_hdr_t *dst, pvr_list_t list, uint32 mode,
/* Compile a polygon context into a polygon header that is affected by
modifier volumes */
void pvr_poly_mod_compile(pvr_poly_mod_hdr_t *dst, const pvr_poly_cxt_t *src) {
- uint32_t txr_base, cmd;
- uint32_t mode2, mode3;
+ uint32_t mode2, mode3, cmd;
+ pvr_txr_ptr_t txr_base;
/* Basically we just take each parameter, clip it, shift it
into place, and OR it into the final result. */
@@ -407,13 +407,12 @@ void pvr_poly_mod_compile(pvr_poly_mod_hdr_t *dst, const pvr_poly_cxt_t *src) {
| FIELD_PREP(PVR_TA_PM2_VSIZE, __builtin_ctz(src->txr.height) - 3);
/* Convert the texture address */
- txr_base = (uint32_t)src->txr.base;
- txr_base = (txr_base & (PVR_RAM_SIZE - 1)) >> 3;
+ txr_base = to_pvr_txr_ptr(src->txr.base);
/* Polygon mode 3 */
mode3 = FIELD_PREP(PVR_TA_PM3_MIPMAP, src->txr.mipmap)
| src->txr.format
- | txr_base;
+ | (uint32_t)txr_base;
}
dst->mode2_0 = mode2;
@@ -447,13 +446,12 @@ void pvr_poly_mod_compile(pvr_poly_mod_hdr_t *dst, const pvr_poly_cxt_t *src) {
| FIELD_PREP(PVR_TA_PM2_VSIZE, __builtin_ctz(src->txr2.height) - 3);
/* Convert the texture address */
- txr_base = (uint32_t)src->txr2.base;
- txr_base = (txr_base & (PVR_RAM_SIZE - 1)) >> 3;
+ txr_base = to_pvr_txr_ptr(src->txr.base);
/* Polygon mode 3 */
mode3 = FIELD_PREP(PVR_TA_PM3_MIPMAP, src->txr2.mipmap)
| src->txr2.format
- | txr_base;
+ | (uint32_t)txr_base;
}
dst->mode2_1 = mode2;
diff --git a/kernel/arch/dreamcast/include/dc/pvr/pvr_header.h b/kernel/arch/dreamcast/include/dc/pvr/pvr_header.h
index f0cc12b6..860b3ea8 100644
--- a/kernel/arch/dreamcast/include/dc/pvr/pvr_header.h
+++ b/kernel/arch/dreamcast/include/dc/pvr/pvr_header.h
@@ -21,6 +21,8 @@
#include <sys/cdefs.h>
__BEGIN_DECLS
+#include <dc/pvr/pvr_regs.h>
+
/** \defgroup pvr_primitives_headers Headers
\brief Structs relative to PVR headers
\ingroup pvr_primitives
@@ -214,7 +216,7 @@ typedef uint32_t pvr_txr_ptr_t;
\return The pre-processed texture address
*/
static inline pvr_txr_ptr_t to_pvr_txr_ptr(pvr_ptr_t addr) {
- return ((uint32_t)addr & 0x00fffff8) >> 3;
+ return ((uint32_t)addr & (PVR_RAM_SIZE - 1)) >> 3;
}
/** \brief Get texture address form VRAM address
hooks/post-receive
--
A pseudo Operating System for the Dreamcast.
|
