AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-18 12:05:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Dreamcast: Use more updated KOS docker image

Browse Source
This commit is contained in:
UnknownShadow200 2024-07-07 08:55:13 +10:00
parent b3abb0f054
commit 2e4d7cd080
6 changed files with 28 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.github/workflows/build_dreamcast.yml vendored
View File

@ -15,14 +15,17 @@ jobs:
build:
runs-on: ubuntu-latest
container:
image: kazade/dreamcast-sdk
image: ghcr.io/kos-builds/kos-dc:sha-656a397-14.1.0
steps:
- uses: actions/checkout@v4
- name: Compile Dreamcast build
id: compile
run: |
source /opt/toolchains/dc/kos/environ.sh
export PATH=/opt/toolchains/dc/kos/utils/img4dc/build/cdi4dc/:$PATH
apt-get update
apt-get -y install genisoimage
wget https://github.com/ClassiCube/rpi-compiling-stuff/raw/main/cdi4dc -O /opt/toolchains/dc/kos/utils/cdi4dc
chmod +x /opt/toolchains/dc/kos/utils/cdi4dc
export PATH=/opt/toolchains/dc/kos/utils/:$PATH
make dreamcast
@ -50,4 +53,4 @@ jobs:
if: ${{ always() && steps.compile.outcome == 'success' }}
with:
DESTINATION_URL: '${{ secrets.NOTIFY_URL }}'
WORKFLOW_NAME: 'dreamcast'
WORKFLOW_NAME: 'dreamcast'

15
misc/dreamcast/DrawColouredQuads.S
View File

@ -8,7 +8,7 @@ _DrawColouredQuads:
fldi0 fr1 ! U = 0
fldi0 fr2 ! V = 0
TransformSetup
ViewportTransformSetup _VP_COL_HWIDTH
!ViewportTransformSetup _VP_COL
.TRANSFORM_QUAD:
LoadColouredVertex
@ -45,14 +45,5 @@ _DrawColouredQuads:
.align 4
.global _VP_COL_HWIDTH
_VP_COL_HWIDTH: .long 0
.global _VP_COL_HHEIGHT
_VP_COL_HHEIGHT: .long 0
.global _VP_COL_X_PLUS_HWIDTH
_VP_COL_X_PLUS_HWIDTH: .long 0
.global _VP_COL_Y_PLUS_HHEIGHT
_VP_COL_Y_PLUS_HHEIGHT: .long 0
!.VP_COL:
! .long _vp

16
misc/dreamcast/DrawTexturedQuads.S
View File

@ -1,12 +1,11 @@
#include "VertexTransform.S"
.global _DrawTexturedQuads
.align 4
.type _DrawTexturedQuads,%function
_DrawTexturedQuads:
! Setup
TransformSetup
ViewportTransformSetup _VP_TEX_HWIDTH
!ViewportTransformSetup .VP_TEX
.TRANSFORM_QUAD:
LoadTexturedVertex
@ -43,14 +42,5 @@ _DrawTexturedQuads:
.align 4
.global _VP_TEX_HWIDTH
_VP_TEX_HWIDTH: .long 0
.global _VP_TEX_HHEIGHT
_VP_TEX_HHEIGHT: .long 0
.global _VP_TEX_X_PLUS_HWIDTH
_VP_TEX_X_PLUS_HWIDTH: .long 0
.global _VP_TEX_Y_PLUS_HHEIGHT
_VP_TEX_Y_PLUS_HHEIGHT: .long 0
!.VP_TEX:
! .long _vp

12
misc/dreamcast/VertexTransform.S
View File

@ -208,12 +208,12 @@
!fr11 = VIEWPORT_Y_PLUS_HHEIGHT
.macro ViewportTransformSetup vp_addr
mova \vp_addr, r0 ! EX, r0 = &VIEWPORT
fmov.s @r0+,fr8 ! LS, fr8 = VIEWPORT_HWIDTH
fmov.s @r0+,fr9 ! LS, fr9 = VIEWPORT_HHEIGHT
fmov.s @r0+,fr10 ! LS, fr10 = VIEWPORT_X_PLUS_HWIDTH
fmov.s @r0+,fr11 ! LS, fr11 = VIEWPORT_Y_PLUS_HHEIGHT
nop ! MT (align to even instructions boundary)
mov.l \vp_addr, r0 ! EX, r0 = &vp
fmov.s @r0+,fr8 ! LS, fr8 = vp->HWIDTH
fmov.s @r0+,fr9 ! LS, fr9 = vp->HHEIGHT
fmov.s @r0+,fr10 ! LS, fr10 = vp->X_PLUS_HWIDTH
fmov.s @r0+,fr11 ! LS, fr11 = vp->Y_PLUS_HHEIGHT
nop ! MT (align to even instructions boundary)
.endm
.macro ViewportTransformVertex

11
src/Graphics_Dreamcast.c
View File

@ -634,11 +634,6 @@ void Gfx_OnWindowResize(void) {
Gfx_SetViewport(0, 0, Game.Width, Game.Height);
}
extern float VP_COL_HWIDTH, VP_TEX_HWIDTH;
extern float VP_COL_HHEIGHT, VP_TEX_HHEIGHT;
extern float VP_COL_X_PLUS_HWIDTH, VP_TEX_X_PLUS_HWIDTH;
extern float VP_COL_Y_PLUS_HHEIGHT, VP_TEX_Y_PLUS_HHEIGHT;
static void PushCommand(void* cmd) {
aligned_vector_push_back(&OP_LIST.vector, cmd, 1);
aligned_vector_push_back(&PT_LIST.vector, cmd, 1);
@ -646,12 +641,6 @@ static void PushCommand(void* cmd) {
}
void Gfx_SetViewport(int x, int y, int w, int h) {
VP_COL_HWIDTH = VP_TEX_HWIDTH = w * 0.5f;
VP_COL_HHEIGHT = VP_TEX_HHEIGHT = h * -0.5f;
VP_COL_X_PLUS_HWIDTH = VP_TEX_X_PLUS_HWIDTH = x + w * 0.5f;
VP_COL_Y_PLUS_HHEIGHT = VP_TEX_Y_PLUS_HHEIGHT = y + h * 0.5f;
Vertex c;
c.flags = PVR_CMD_USERCLIP | 0x23;
c.x = w * 0.5f; // hwidth

16
src/LScreens.c
View File

@ -204,14 +204,16 @@ LAYOUTS mode_btnBack[] = { { ANCHOR_CENTRE, 0 }, { ANCHOR_CENTRE, 170 } };
CC_NOINLINE static void ChooseMode_Click(cc_bool classic, cc_bool classicHacks) {
Options_SetBool(OPT_CLASSIC_MODE, classic);
if (classic) Options_SetBool(OPT_CLASSIC_HACKS, classicHacks);
Options_PauseSaving();
Options_SetBool(OPT_CLASSIC_MODE, classic);
if (classic) Options_SetBool(OPT_CLASSIC_HACKS, classicHacks);
Options_SetBool(OPT_CUSTOM_BLOCKS, !classic);
Options_SetBool(OPT_CPE, !classic);
Options_SetBool(OPT_SERVER_TEXTURES, !classic);
Options_SetBool(OPT_CLASSIC_TABLIST, classic);
Options_SetBool(OPT_CLASSIC_OPTIONS, classic);
Options_SetBool(OPT_CUSTOM_BLOCKS, !classic);
Options_SetBool(OPT_CPE, !classic);
Options_SetBool(OPT_SERVER_TEXTURES, !classic);
Options_SetBool(OPT_CLASSIC_TABLIST, classic);
Options_SetBool(OPT_CLASSIC_OPTIONS, classic);
Options_ResumeSaving();
Options_SaveIfChanged();
Launcher_LoadTheme();