Apple-2-SW/prog8
1
0
Fork 0
mirror of https://github.com/irmen/prog8.git synced 2024-11-22 15:33:02 +00:00
Code Issues Projects Releases Wiki Activity

fix bmx palette writing from buffer

Browse Source
This commit is contained in:
Irmen de Jong 2023-11-26 01:48:54 +01:00
parent 2764d235a9
commit 5f6cff739a
1 changed files with 32 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
compiler/res/prog8lib/cx16/bmx.p8
View File

@ -21,7 +21,7 @@ bmx {
uword error_message ; pointer to error message, or 0 if all ok uword error_message ; pointer to error message, or 0 if all ok
uword max_width = 0 ; should you want load() to check for this uword max_width = 0 ; should you want load() to check for this
uword max_height = 0 ; should you want load() to check for this uword max_height = 0 ; should you want load() to check for this
uword palette_buffer_ptr = 0 ; should you want to load the palette into main memory instead of directly into vram uword palette_buffer_ptr = 0 ; should you want to load or save the palette into main memory instead of directly into vram
sub load(ubyte drivenumber, str filename, ubyte vbank, uword vaddr, uword screen_width) -> bool { sub load(ubyte drivenumber, str filename, ubyte vbank, uword vaddr, uword screen_width) -> bool {
; Loads a BMX bitmap image and palette into vram. (and Header info into the bmx.* variables) ; Loads a BMX bitmap image and palette into vram. (and Header info into the bmx.* variables)
@ -97,7 +97,8 @@ load_end:
} }
sub load_palette(ubyte drivenumber, str filename) -> bool { sub load_palette(ubyte drivenumber, str filename) -> bool {
; Loads just the palette from a BMX bitmap image into vram. (and Header info into the bmx.* variables) ; Loads just the palette from a BMX bitmap image into vram or the palette buffer.
; (and Header info into the bmx.* variables).
; Parameters: the drive number and filename to load. ; Parameters: the drive number and filename to load.
; Returns: success status. If false, error_message points to the error message string. ; Returns: success status. If false, error_message points to the error message string.
error_message = 0 error_message = 0
@ -192,21 +193,21 @@ save_end:
; if palette_buffer_ptr is not 0, the palette data is read into that memory buffer, ; if palette_buffer_ptr is not 0, the palette data is read into that memory buffer,
; otherwise it is read directly into the palette in vram. ; otherwise it is read directly into the palette in vram.
cx16.vaddr(1, $fa00+palette_start*2, 0, 1) cx16.vaddr(1, $fa00+palette_start*2, 0, 1)
cx16.r1 = palette_buffer_ptr cx16.r3 = palette_buffer_ptr
cx16.r0L = palette_entries cx16.r2L = palette_entries
do { do {
cx16.r2L = cbm.CHRIN() cx16.r4L = cbm.CHRIN()
cx16.r2H = cbm.CHRIN() cx16.r4H = cbm.CHRIN()
if cx16.r1 { if cx16.r3 {
pokew(cx16.r1, cx16.r2) ; into memory pokew(cx16.r3, cx16.r4) ; into memory
cx16.r1+=2 cx16.r3+=2
} else { } else {
cx16.VERA_DATA0 = cx16.r2L ; into vram cx16.VERA_DATA0 = cx16.r4L ; into vram
cx16.VERA_DATA0 = cx16.r2H cx16.VERA_DATA0 = cx16.r4H
} }
cx16.r0L-- cx16.r2L--
} until cx16.r0L==0 } until cx16.r2L==0
return not cbm.READST() return cbm.READST()==0 or cbm.READST()&$40 ; no error or eof?
} }
sub read_bitmap(ubyte vbank, uword vaddr, uword screenwidth) -> bool { sub read_bitmap(ubyte vbank, uword vaddr, uword screenwidth) -> bool {
@ -221,7 +222,7 @@ save_end:
repeat cx16.r2 repeat cx16.r2
cx16.VERA_DATA0 = 0 ; pad out if image width < screen width cx16.VERA_DATA0 = 0 ; pad out if image width < screen width
} }
return cbm.READST()==0 or cbm.READST()&$40 ; eof? return cbm.READST()==0 or cbm.READST()&$40 ; no error or eof?
sub read_scanline(uword size) { sub read_scanline(uword size) {
while size { while size {
@ -248,14 +249,24 @@ save_end:
} }
sub write_palette() -> bool { sub write_palette() -> bool {
; save full palette straight out of vram to the currently active output file ; write palette data to the currently active input file
; if palette_buffer_ptr is not 0, the palette data is read from that memory buffer,
; otherwise it is read directly from the palette in vram.
cx16.r3 = palette_buffer_ptr
cx16.r2L = palette_entries
cx16.vaddr(1, $fa00+palette_start*2, 0, 1) cx16.vaddr(1, $fa00+palette_start*2, 0, 1)
cx16.r0L = palette_entries
do { do {
cbm.CHROUT(cx16.VERA_DATA0) if cx16.r3 {
cbm.CHROUT(cx16.VERA_DATA0) cbm.CHROUT(@(cx16.r3)) ; from memory
cx16.r0L-- cx16.r3++
} until cx16.r0L==0 cbm.CHROUT(@(cx16.r3))
cx16.r3++
} else {
cbm.CHROUT(cx16.VERA_DATA0) ; from vram
cbm.CHROUT(cx16.VERA_DATA0)
}
cx16.r2L--
} until cx16.r2L==0
return not cbm.READST() return not cbm.READST()
} }