diff --git a/common.lds b/common.lds index e1deb4e..98b0c1b 100644 --- a/common.lds +++ b/common.lds @@ -43,10 +43,11 @@ SECTIONS .text.vbr ALIGN(4) : SUBALIGN(4) { + __vbr100 = .; KEEP(*(.vbr.100)) - . = ALIGN(0x300); + . = __vbr100 + 0x300; KEEP(*(.vbr.400)) - . = ALIGN(0x200); + . = __vbr100 + 0x500; KEEP(*(.vbr.600)) } > p1ram diff --git a/example/example.mk b/example/example.mk index ef585ad..5c44e08 100644 --- a/example/example.mk +++ b/example/example.mk @@ -87,6 +87,32 @@ MACAW_MULTIPASS_OBJ = \ example/macaw_multipass.elf: LDSCRIPT = $(LIB)/main.lds example/macaw_multipass.elf: $(START_OBJ) $(MACAW_MULTIPASS_OBJ) +POPPIES_MOSAIC_OBJ = \ + example/poppies_mosaic.o \ + holly/video_output.o \ + holly/core.o \ + holly/region_array.o \ + holly/background.o \ + holly/ta_fifo_polygon_converter.o \ + texture/poppies/poppies.data.o \ + sh7091/serial.o + +example/poppies_mosaic.elf: LDSCRIPT = $(LIB)/main.lds +example/poppies_mosaic.elf: $(START_OBJ) $(POPPIES_MOSAIC_OBJ) + +POPPIES_MOSAIC2_OBJ = \ + example/poppies_mosaic2.o \ + holly/video_output.o \ + holly/core.o \ + holly/region_array.o \ + holly/background.o \ + holly/ta_fifo_polygon_converter.o \ + texture/poppies/poppies.data.o \ + sh7091/serial.o + +example/poppies_mosaic2.elf: LDSCRIPT = $(LIB)/main.lds +example/poppies_mosaic2.elf: $(START_OBJ) $(POPPIES_MOSAIC2_OBJ) + FONT_BITMAP_OBJ = \ example/font_bitmap.o \ holly/video_output.o \ diff --git a/holly/core.cpp b/holly/core.cpp index c6799db..9c55d55 100644 --- a/holly/core.cpp +++ b/holly/core.cpp @@ -67,7 +67,9 @@ void core_start_render(uint32_t frame_address, | isp_backgnd_t::skip(1); holly.ISP_BACKGND_D = _i(1.f/100000.f); - holly.FB_W_CTRL = fb_w_ctrl::fb_dither | fb_w_ctrl::fb_packmode::_565_rgb_16bit; + holly.FB_W_CTRL = 0 + //| fb_w_ctrl::fb_dither + | fb_w_ctrl::fb_packmode::_565_rgb_16bit; constexpr uint32_t bytes_per_pixel = 2; holly.FB_W_LINESTRIDE = (frame_width * bytes_per_pixel) / 8;