Menu
▾
▴
[cadcdev-svn-commits] [SCM] branch master updated. v2.0.0-1364-ga69d61cd
|
From: ljsebald <ljs...@us...> - 2024-04-27 03:45:11
|
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 a69d61cdf816bd520b873698ba26832dce49d496 (commit)
via 12a8218d4fcad189bc94ac9673fbd828c52457e6 (commit)
via c751407a3d3568835b8e225c5224531668c61120 (commit)
via 5037642a668108ec8760ef12f311b3487297089b (commit)
from b51c6aa33c13fa0b68f6485e06108bf19c53d812 (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 a69d61cdf816bd520b873698ba26832dce49d496
Merge: 12a8218d 5037642a
Author: Lawrence Sebald <ljs...@us...>
Date: Fri Apr 26 23:27:59 2024 -0400
Merge pull request #525 from KallistiOS/treeless-clone
dc-chain: Use treeless clone when git repo is used as source
commit 12a8218d4fcad189bc94ac9673fbd828c52457e6
Merge: b51c6aa3 c751407a
Author: Lawrence Sebald <ljs...@us...>
Date: Fri Apr 26 23:26:04 2024 -0400
Merge pull request #527 from Dreamcast-Projects/fix_example_warns
Fix example warnings and docs in SQ
commit c751407a3d3568835b8e225c5224531668c61120
Author: Andress Barajas <and...@gm...>
Date: Fri Apr 26 20:10:17 2024 -0700
Fix example warnings and docs in SQ
commit 5037642a668108ec8760ef12f311b3487297089b
Author: darcagn <da...@pr...>
Date: Fri Apr 26 17:10:10 2024 -0600
Use treeless clone when git repo is used as source
-----------------------------------------------------------------------
Summary of changes:
examples/dreamcast/Makefile | 2 +-
examples/dreamcast/basic/exec/exec.c | 2 --
examples/dreamcast/kgl/basic/gl/gltest.c | 2 +-
examples/dreamcast/kgl/benchmarks/quadmark/quadmark.c | 2 +-
examples/dreamcast/kgl/benchmarks/trimark/trimark.c | 2 +-
examples/dreamcast/kgl/benchmarks/tristripmark/tristripmark.c | 2 +-
examples/dreamcast/parallax/delay_cube/delay_cube.c | 2 +-
examples/dreamcast/parallax/rotocube/rotocube.c | 2 +-
examples/dreamcast/pvr/pvrmark/pvrmark.c | 2 +-
examples/dreamcast/pvr/pvrmark_strips/pvrmark_strips.c | 2 +-
.../dreamcast/pvr/pvrmark_strips_direct/pvrmark_strips_direct.c | 2 +-
examples/dreamcast/pvr/texture_render/texture_render.c | 2 +-
kernel/arch/dreamcast/include/dc/sq.h | 6 +++---
utils/dc-chain/scripts/download.mk | 2 +-
14 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/examples/dreamcast/Makefile b/examples/dreamcast/Makefile
index dc867de2..23e25f7b 100644
--- a/examples/dreamcast/Makefile
+++ b/examples/dreamcast/Makefile
@@ -5,7 +5,7 @@
#
DIRS = 2ndmix basic libdream kgl hello sound png network vmu conio pvr video \
- lua parallax modem dreameye sd g1ata lightgun keyboard sdl random rumble \
+ lua parallax modem dreameye sd g1ata lightgun keyboard sdl dev rumble \
micropython
ifdef KOS_CCPLUS
diff --git a/examples/dreamcast/basic/exec/exec.c b/examples/dreamcast/basic/exec/exec.c
index a617341c..edcb201d 100644
--- a/examples/dreamcast/basic/exec/exec.c
+++ b/examples/dreamcast/basic/exec/exec.c
@@ -7,8 +7,6 @@
#include <kos.h>
#include <assert.h>
-#define false (1 == 0)
-
int main(int argc, char **argv) {
file_t f;
void *subelf;
diff --git a/examples/dreamcast/kgl/basic/gl/gltest.c b/examples/dreamcast/kgl/basic/gl/gltest.c
index 17f9bdc8..c918ee91 100644
--- a/examples/dreamcast/kgl/basic/gl/gltest.c
+++ b/examples/dreamcast/kgl/basic/gl/gltest.c
@@ -235,7 +235,7 @@ int main(int argc, char **argv) {
}
pvr_get_stats(&stats);
- printf("VBL Count: %ld, last_time: %d, frame rate: %f fps\n",
+ printf("VBL Count: %d, last_time: %lld, frame rate: %f fps\n",
stats.vbl_count, stats.frame_last_time, (double)stats.frame_rate);
return 0;
diff --git a/examples/dreamcast/kgl/benchmarks/quadmark/quadmark.c b/examples/dreamcast/kgl/benchmarks/quadmark/quadmark.c
index f4c0ff03..5951d2b1 100644
--- a/examples/dreamcast/kgl/benchmarks/quadmark/quadmark.c
+++ b/examples/dreamcast/kgl/benchmarks/quadmark/quadmark.c
@@ -39,7 +39,7 @@ void stats(void) {
pvr_stats_t stats;
pvr_get_stats(&stats);
- dbglog(DBG_DEBUG, "3D Stats: %ld VBLs, frame rate ~%f fps\n",
+ dbglog(DBG_DEBUG, "3D Stats: %d VBLs, frame rate ~%f fps\n",
stats.vbl_count, (double)stats.frame_rate);
}
diff --git a/examples/dreamcast/kgl/benchmarks/trimark/trimark.c b/examples/dreamcast/kgl/benchmarks/trimark/trimark.c
index d946cd9d..c4451b5c 100644
--- a/examples/dreamcast/kgl/benchmarks/trimark/trimark.c
+++ b/examples/dreamcast/kgl/benchmarks/trimark/trimark.c
@@ -39,7 +39,7 @@ void stats(void) {
pvr_stats_t stats;
pvr_get_stats(&stats);
- dbglog(DBG_DEBUG, "3D Stats: %ld VBLs, frame rate ~%f fps\n",
+ dbglog(DBG_DEBUG, "3D Stats: %d VBLs, frame rate ~%f fps\n",
stats.vbl_count, (double)stats.frame_rate);
}
diff --git a/examples/dreamcast/kgl/benchmarks/tristripmark/tristripmark.c b/examples/dreamcast/kgl/benchmarks/tristripmark/tristripmark.c
index aa2cfcd0..96f00f90 100644
--- a/examples/dreamcast/kgl/benchmarks/tristripmark/tristripmark.c
+++ b/examples/dreamcast/kgl/benchmarks/tristripmark/tristripmark.c
@@ -39,7 +39,7 @@ void stats(void) {
pvr_stats_t stats;
pvr_get_stats(&stats);
- dbglog(DBG_DEBUG, "3D Stats: %ld VBLs, frame rate ~%f fps\n",
+ dbglog(DBG_DEBUG, "3D Stats: %d VBLs, frame rate ~%f fps\n",
stats.vbl_count, (double)stats.frame_rate);
}
diff --git a/examples/dreamcast/parallax/delay_cube/delay_cube.c b/examples/dreamcast/parallax/delay_cube/delay_cube.c
index 45189664..a4ae22ef 100644
--- a/examples/dreamcast/parallax/delay_cube/delay_cube.c
+++ b/examples/dreamcast/parallax/delay_cube/delay_cube.c
@@ -185,7 +185,7 @@ int main(int argc, char **argv) {
// You have to keep a watch on these, especially the vertex used
// for really poly intensive effects.
pvr_get_stats(&stats);
- dbglog(DBG_DEBUG, "3D Stats: %ld vblanks, frame rate ~%f fps, max vertex used %d bytes\n",
+ dbglog(DBG_DEBUG, "3D Stats: %d vblanks, frame rate ~%f fps, max vertex used %d bytes\n",
stats.vbl_count, (double)stats.frame_rate, stats.vtx_buffer_used_max);
return 0;
diff --git a/examples/dreamcast/parallax/rotocube/rotocube.c b/examples/dreamcast/parallax/rotocube/rotocube.c
index 347562f9..7f5b50bb 100644
--- a/examples/dreamcast/parallax/rotocube/rotocube.c
+++ b/examples/dreamcast/parallax/rotocube/rotocube.c
@@ -178,7 +178,7 @@ int main(int argc, char **argv) {
// You have to keep a watch on these, especially the vertex used
// for really poly intensive effects.
pvr_get_stats(&stats);
- dbglog(DBG_DEBUG, "3D Stats: %ld vblanks, frame rate ~%f fps, max vertex used %d bytes\n",
+ dbglog(DBG_DEBUG, "3D Stats: %d vblanks, frame rate ~%f fps, max vertex used %d bytes\n",
stats.vbl_count, (double)stats.frame_rate, stats.vtx_buffer_used_max);
return 0;
diff --git a/examples/dreamcast/pvr/pvrmark/pvrmark.c b/examples/dreamcast/pvr/pvrmark/pvrmark.c
index e53429f5..c2edb7a1 100644
--- a/examples/dreamcast/pvr/pvrmark/pvrmark.c
+++ b/examples/dreamcast/pvr/pvrmark/pvrmark.c
@@ -33,7 +33,7 @@ void stats(void) {
pvr_stats_t stats;
pvr_get_stats(&stats);
- dbglog(DBG_DEBUG, "3D Stats: %ld VBLs, frame rate ~%f fps\n",
+ dbglog(DBG_DEBUG, "3D Stats: %d VBLs, frame rate ~%f fps\n",
stats.vbl_count, (double)stats.frame_rate);
}
diff --git a/examples/dreamcast/pvr/pvrmark_strips/pvrmark_strips.c b/examples/dreamcast/pvr/pvrmark_strips/pvrmark_strips.c
index cc2624b9..bcca11e8 100644
--- a/examples/dreamcast/pvr/pvrmark_strips/pvrmark_strips.c
+++ b/examples/dreamcast/pvr/pvrmark_strips/pvrmark_strips.c
@@ -33,7 +33,7 @@ void stats(void) {
pvr_stats_t stats;
pvr_get_stats(&stats);
- dbglog(DBG_DEBUG, "3D Stats: %ld VBLs, frame rate ~%f fps\n",
+ dbglog(DBG_DEBUG, "3D Stats: %d VBLs, frame rate ~%f fps\n",
stats.vbl_count, (double)stats.frame_rate);
}
diff --git a/examples/dreamcast/pvr/pvrmark_strips_direct/pvrmark_strips_direct.c b/examples/dreamcast/pvr/pvrmark_strips_direct/pvrmark_strips_direct.c
index 62af9a2b..df3e1d73 100644
--- a/examples/dreamcast/pvr/pvrmark_strips_direct/pvrmark_strips_direct.c
+++ b/examples/dreamcast/pvr/pvrmark_strips_direct/pvrmark_strips_direct.c
@@ -33,7 +33,7 @@ void stats(void) {
pvr_stats_t stats;
pvr_get_stats(&stats);
- dbglog(DBG_DEBUG, "3D Stats: %ld frames, frame rate ~%f fps\n",
+ dbglog(DBG_DEBUG, "3D Stats: %d frames, frame rate ~%f fps\n",
stats.vbl_count, (double)stats.frame_rate);
}
diff --git a/examples/dreamcast/pvr/texture_render/texture_render.c b/examples/dreamcast/pvr/texture_render/texture_render.c
index 231b45c0..b5aa600e 100644
--- a/examples/dreamcast/pvr/texture_render/texture_render.c
+++ b/examples/dreamcast/pvr/texture_render/texture_render.c
@@ -246,7 +246,7 @@ int main(int argc, char **argv) {
(double)(counter / ((float)end - start) * 1000.0f));
pvr_get_stats(&stats);
- printf("From pvr_get_stats:\n\tVBlank Count: %lu\n\tFrame Count: %lu\n",
+ printf("From pvr_get_stats:\n\tVBlank Count: %u\n\tFrame Count: %u\n",
stats.vbl_count, stats.frame_count);
pvr_mem_free(d_texture);
diff --git a/kernel/arch/dreamcast/include/dc/sq.h b/kernel/arch/dreamcast/include/dc/sq.h
index 3fc2018a..37ffbeeb 100644
--- a/kernel/arch/dreamcast/include/dc/sq.h
+++ b/kernel/arch/dreamcast/include/dc/sq.h
@@ -166,7 +166,7 @@ void *sq_fast_cpy(void *dest, const void *src, size_t n);
\param n The number of bytes to set (multiple of 32).
\return The original value of dest.
- \sa sq_set16(), sq_set32(), sq_set_pvr()
+ \sa sq_set16(), sq_set32()
*/
void *sq_set(void *dest, uint32_t c, size_t n);
@@ -185,7 +185,7 @@ void *sq_set(void *dest, uint32_t c, size_t n);
\param n The number of bytes to set (multiple of 32).
\return The original value of dest.
- \sa sq_set(), sq_set32(), sq_set_pvr()
+ \sa sq_set(), sq_set32()
*/
void *sq_set16(void *dest, uint32_t c, size_t n);
@@ -203,7 +203,7 @@ void *sq_set16(void *dest, uint32_t c, size_t n);
\param n The number of bytes to set (multiple of 32).
\return The original value of dest.
- \sa sq_set(), sq_set16(), sq_set_pvr()
+ \sa sq_set(), sq_set16()
*/
void *sq_set32(void *dest, uint32_t c, size_t n);
diff --git a/utils/dc-chain/scripts/download.mk b/utils/dc-chain/scripts/download.mk
index af2f6ac3..8c19eafb 100644
--- a/utils/dc-chain/scripts/download.mk
+++ b/utils/dc-chain/scripts/download.mk
@@ -127,7 +127,7 @@ GIT_TARGETS = $(foreach target,$(FROM_GIT_REPOS), $(stamp_$(target)_download))
$(GIT_TARGETS):
@echo "+++ Cloning $(git_repo)..."
rm -rf $(name)
- git clone $(git_repo) $(additional_git_args) $(if $(dest),$(dest),$(name))
+ git clone --filter=tree:0 $(git_repo) $(additional_git_args) $(if $(dest),$(dest),$(name))
touch $@
hooks/post-receive
--
A pseudo Operating System for the Dreamcast.
|
