jaby
/
jabyengine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Change to double buffering and SPRT_16

This commit is contained in:
jaby 2023-12-20 15:12:21 -05:00
parent d7fce900f9
commit 4bf87bc85f
5 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/PSX/GPU/gpu.hpp
View File

@ -37,6 +37,14 @@ namespace JabyEngine {
static void set_offset(uint16_t x, uint16_t y); static void set_offset(uint16_t x, uint16_t y);
}; };
static uint32_t update_id() {
return Display::current_id;
}
static uint32_t render_id() {
return Display::current_id ^ 1;
}
namespace internal { namespace internal {
void render(const uint32_t* data, size_t words); void render(const uint32_t* data, size_t words);
void render_dma(const uint32_t* data); void render_dma(const uint32_t* data);

2
support/include/FontWriter/Type/types.hpp
View File

@ -4,7 +4,7 @@
#include <PSX/GPU/make_gpu_primitives.hpp> #include <PSX/GPU/make_gpu_primitives.hpp>
namespace JabyEngine { namespace JabyEngine {
using FontPrimitive = GPU::SPRT::Linked; using FontPrimitive = GPU::SPRT_16::Linked;
struct FontInfo { struct FontInfo {
GPU::SizeU16 texture_size; GPU::SizeU16 texture_size;

5
support/include/FontWriter/font_writer.hpp
View File

@ -11,7 +11,7 @@ namespace JabyEngine {
FontWriter::write(state, str, color, wiggle, list); \ FontWriter::write(state, str, color, wiggle, list); \
va_end(list) va_end(list)
GPU::TexPage::Linked tex_page; GPU::TexPage::Linked tex_page[2];
GPU::SizeI16 font_size; GPU::SizeI16 font_size;
GPU::PageClut clut; GPU::PageClut clut;
GPU::Link* last_primitive; GPU::Link* last_primitive;
@ -22,7 +22,8 @@ namespace JabyEngine {
static constexpr FontWriter empty() { static constexpr FontWriter empty() {
FontWriter instance; FontWriter instance;
instance.tex_page = {0}; instance.tex_page[0] = {0};
instance.tex_page[1] = {0};
instance.font_size = Make::SizeI16(); instance.font_size = Make::SizeI16();
instance.clut = Make::PageClut(); instance.clut = Make::PageClut();
instance.last_primitive = nullptr; instance.last_primitive = nullptr;

19
support/src/FontWriter/src/font_writer.cpp
View File

@ -48,10 +48,12 @@ namespace JabyEngine {
} }
void FontWriter :: setup(const SimpleTIM& vram_dst, const GPU::SizeI16& font_size) { void FontWriter :: setup(const SimpleTIM& vram_dst, const GPU::SizeI16& font_size) {
this->tex_page = Make::TexPage(vram_dst.get_texture_position(), GPU::TexturePageColor::$4bit).linked(); for(auto& tex_page : this->tex_page) {
tex_page = Make::TexPage(vram_dst.get_texture_position(), GPU::TexturePageColor::$4bit).linked();
}
this->font_size = font_size; this->font_size = font_size;
this->clut = Make::PageClut(vram_dst.get_clut_position()); this->clut = Make::PageClut(vram_dst.get_clut_position());
this->last_primitive = &this->tex_page; this->last_primitive = nullptr;
} }
void FontWriter :: write(State& state, const char* str, GPU::Color24 color, Wiggle* wiggle, va_list list) { void FontWriter :: write(State& state, const char* str, GPU::Color24 color, Wiggle* wiggle, va_list list) {
@ -59,13 +61,15 @@ namespace JabyEngine {
return {str + 1, new_str}; return {str + 1, new_str};
}; };
if(!this->last_primitive) {
this->last_primitive = &this->tex_page[GPU::update_id()];
}
const auto row_count = 256/font_size.width; const auto row_count = 256/font_size.width;
const auto push_char = [&](State& state, char cur_char) -> bool { const auto push_char = [&](State& state, char cur_char) -> bool {
auto& primitive = GlobalPrimitiveFactory.new_primitive(); auto& primitive = GlobalPrimitiveFactory.new_primitive();
primitive->position = state.pos; primitive->position = state.pos;
primitive->size = this->font_size;
if(wiggle) { if(wiggle) {
const auto [off_x, off_y] = (*wiggle)[(state.wiggle_count++)&0x7]; const auto [off_x, off_y] = (*wiggle)[(state.wiggle_count++)&0x7];
primitive->position.move(off_x, off_y); primitive->position.move(off_x, off_y);
@ -131,12 +135,9 @@ namespace JabyEngine {
} }
void FontWriter :: render() { void FontWriter :: render() {
const auto update_id = GPU::Display::current_id;
const auto render_id = update_id ^ 1;
this->last_primitive->terminate(); this->last_primitive->terminate();
this->last_primitive = &this->tex_page; this->last_primitive = nullptr;
GPU::render(this->tex_page); GPU::render(this->tex_page[GPU::render_id()]);
} }
} }

2
support/src/FontWriter/src/global_primitive_buffer.cpp
View File

@ -8,7 +8,7 @@ namespace JabyEngine {
const auto*const buffer_end = start + length; const auto*const buffer_end = start + length;
for(auto* cur_prim = start; cur_prim < buffer_end; cur_prim++) { for(auto* cur_prim = start; cur_prim < buffer_end; cur_prim++) {
*cur_prim = FontPrimitive::create(GPU::SPRT::create(Make::AreaI16(), Make::OffsetPageWithClut())); *cur_prim = FontPrimitive::create(Make::SPRT_16(Make::Vertex(), Make::OffsetPageWithClut()));
} }
GlobalPrimitiveFactory = PrimitiveFactory::create(start, length); GlobalPrimitiveFactory = PrimitiveFactory::create(start, length);