Working on refactoring VU stuff still

nicholas477 · Dec 12, 2024 · 677eb02 · 677eb02
1 parent ec8fd9a
commit 677eb02
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 66 deletions.
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -24,7 +24,7 @@ jobs:
     - uses: actions/checkout@v3
     - name: Get dependencies
       run: |
-        apk add sudo bash build-base binutils-dev git cmake xorriso assimp-dev musl-obstack-dev jsoncpp-dev imagemagick-dev sox
+        apk add sudo bash build-base binutils-dev git cmake xorriso assimp-dev musl-obstack-dev jsoncpp-dev imagemagick-dev sox stb
 
     - name: Compile ps2 engine
       run: |

diff --git a/dependencies/egg-ps2-graphics-lib/src/vu_programs.cc b/dependencies/egg-ps2-graphics-lib/src/vu_programs.cc
@@ -15,6 +15,6 @@ namespace vu1_programs
 DEFINE_VU_PROGRAM(xgkick, xgkick);
 DEFINE_VU_PROGRAM(vertex_color_texture_renderer, VertexColorTextureRenderer);
 DEFINE_VU_PROGRAM(vertex_color_renderer, VertexColorRenderer);
-DEFINE_VU_PROGRAM(project, project);
+DEFINE_VU_PROGRAM(project, Project);
 } // namespace vu1_programs
 } // namespace egg::ps2::graphics
diff --git a/dependencies/egg-ps2-graphics-lib/vu1/project.vo b/dependencies/egg-ps2-graphics-lib/vu1/project.vo
diff --git a/dependencies/egg-ps2-graphics-lib/vu1/project.vsm b/dependencies/egg-ps2-graphics-lib/vu1/project.vsm
diff --git a/src/renderer/gs.cc b/src/renderer/gs.cc
@@ -92,8 +92,8 @@ void init()
 	epg::init(gs_options);
 
 	// Load vertex color + textured vertex color programs
-	epg::vu1_programs::get_vertex_color_program_addr()         = epg::load_vu_program(epg::vu1_programs::get_vertex_color_program_mem_address());
-	epg::vu1_programs::get_vertex_color_texture_program_addr() = epg::load_vu_program(epg::vu1_programs::get_vertex_color_texture_program_mem_address());
+	epg::vu1_programs::get_vertex_color_renderer().load_program();
+	epg::vu1_programs::get_vertex_color_texture_renderer().load_program();
 
 	epg::gs_mem::allocate_texture_slot(1);
 	epg::gs_mem::allocate_texture_slot(1);