Removed vertex_color_render program, changed register allocations

nicholas477 · Dec 18, 2024 · 5ba5faf · 5ba5faf
1 parent 55453c9
commit 5ba5faf
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 151 deletions.
diff --git a/dependencies/egg-ps2-graphics-lib/Makefile.vuprogs b/dependencies/egg-ps2-graphics-lib/Makefile.vuprogs
@@ -2,7 +2,6 @@ EE_DVP = dvp-as
 VCL = vcl
 
 RENDERERS = \
-	vertex_color_renderer \
 	vertex_color_texture_renderer \
 	project \
 	project_clip \

diff --git a/dependencies/egg-ps2-graphics-lib/include/egg-ps2-graphics-lib/vu_programs.hpp b/dependencies/egg-ps2-graphics-lib/include/egg-ps2-graphics-lib/vu_programs.hpp
@@ -65,7 +65,6 @@ namespace egg::ps2::graphics::vu1_programs
 {
 DECLARE_VU_PROGRAM(xgkick);
 DECLARE_VU_PROGRAM(vertex_color_texture_renderer);
-DECLARE_VU_PROGRAM(vertex_color_renderer);
 DECLARE_VU_PROGRAM(project);
 DECLARE_VU_PROGRAM(project_clip);
 DECLARE_VU_PROGRAM(vertex_color);

diff --git a/dependencies/egg-ps2-graphics-lib/src/vu_programs.cc b/dependencies/egg-ps2-graphics-lib/src/vu_programs.cc
@@ -21,7 +21,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_clip, ProjectClip);
 DEFINE_VU_PROGRAM(vertex_color, VertexColor);

diff --git a/dependencies/egg-ps2-graphics-lib/vu1/vertex_color_renderer.vcl b/dependencies/egg-ps2-graphics-lib/vu1/vertex_color_renderer.vcl
diff --git a/dependencies/egg-ps2-graphics-lib/vu1/vu1_defs.h b/dependencies/egg-ps2-graphics-lib/vu1/vu1_defs.h
@@ -17,11 +17,11 @@
 
 #define VERTEXIN (JUMPTABLE + 2)
 
+#define BASE_REG VI14
+
 // Return address register.
 // Used for returning from programs back to the jump table
-#define RETADDR_REG VI13
-
-#define BASE_REG VI12
+#define RETADDR_REG VI15
 
 #define RETURN jr retaddr: dummy
 

diff --git a/src/renderer/gs.cc b/src/renderer/gs.cc
@@ -91,10 +91,6 @@ void init()
 
 	epg::init(gs_options);
 
-	// Load vertex color + textured vertex color programs
-	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);
 	epg::gs_mem::allocate_texture_slot(1);