Skip to content

Commit

Permalink
typed vertices parameter
Browse files Browse the repository at this point in the history
  • Loading branch information
@rickgaiser @fjtrujy
rickgaiser authored and fjtrujy committed Aug 21, 2023
1 parent 5633eae commit 6a51380
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 18 deletions.
18 changes: 9 additions & 9 deletions ee/gs/include/gsPrimitive.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@ extern "C" {
#endif

void gsKit_prim_point(GSGLOBAL *gsGlobal, float x, float y, int iz, u64 color);
void gsKit_prim_list_points(GSGLOBAL *gsGlobal, int count, const void *vertices);
void gsKit_prim_list_points(GSGLOBAL *gsGlobal, int count, const GSPRIMPOINT *vertices);

void gsKit_prim_line_3d(GSGLOBAL *gsGlobal, float x1, float y1, int iz1,
float x2, float y2, int iz2, u64 color);

void gsKit_prim_line_goraud_3d(GSGLOBAL *gsGlobal, float x1, float y1, int iz1, float x2, float y2, int iz2, u64 color1, u64 color2);
void gsKit_prim_list_line_goraud_3d(GSGLOBAL *gsGlobal, int count, const void *vertices);
void gsKit_prim_list_line_goraud_3d(GSGLOBAL *gsGlobal, int count, const GSPRIMPOINT *vertices);

void gsKit_prim_line_strip(GSGLOBAL *gsGlobal, float *LineStrip, int segments, int iz, u64 color);

Expand All @@ -64,8 +64,8 @@ void gsKit_prim_triangle_gouraud_3d(GSGLOBAL *gsGlobal, float x1, float y1, int
float x3, float y3, int iz3,
u64 color1, u64 color2, u64 color3);

void gsKit_prim_list_triangle_gouraud_3d(GSGLOBAL *gsGlobal, int count, const void *vertices);
void gsKit_prim_list_triangle_gouraud_3d(GSGLOBAL *gsGlobal, int count, const GSPRIMPOINT *vertices);

void gsKit_prim_quad_3d(GSGLOBAL *gsGlobal, float x1, float y1, int iz1,
float x2, float y2, int iz2,
float x3, float y3, int iz3,
Expand All @@ -77,14 +77,14 @@ void gsKit_prim_quad_gouraud_3d(GSGLOBAL *gsGlobal, float x1, float y1, int iz1,
float x4, float y4, int iz4,
u64 color1, u64 color2,
u64 color3, u64 color4);


#define gsKit_prim_line(gsGlobal, x1, y1, \
x2, y2, \
z, color) \
gsKit_prim_line_3d(gsGlobal, x1, y1, z, \
x2, y2, z, color);

#define gsKit_prim_line_goraud(gsGlobal, x1, y1, \
x2, y2, \
z, color1, color2) \
Expand Down Expand Up @@ -117,7 +117,7 @@ void gsKit_prim_quad_gouraud_3d(GSGLOBAL *gsGlobal, float x1, float y1, int iz1,
x2, y2, z, \
x3, y3, z, \
x4, y4, z, color);

#define gsKit_prim_quad_gouraud(gsGlobal, x1, y1, \
x2, y2, \
x3, y3, \
Expand All @@ -127,8 +127,8 @@ void gsKit_prim_quad_gouraud_3d(GSGLOBAL *gsGlobal, float x1, float y1, int iz1,
x2, y2, z, \
x3, y3, z, \
x4, y4, z, \
color1, color2, color3, color4);
color1, color2, color3, color4);


#ifdef __cplusplus
}
Expand Down
6 changes: 3 additions & 3 deletions ee/gs/include/gsTexture.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ void gsKit_prim_sprite_striped_texture_3d(GSGLOBAL *gsGlobal, const GSTEXTURE *T
float x2, float y2, int iz2, float u2, float v2,
u64 color);

void gskit_prim_list_sprite_texture_uv_3d(GSGLOBAL *gsGlobal, const GSTEXTURE *Texture, int count, const void *vertices);
void gskit_prim_list_sprite_texture_uv_3d(GSGLOBAL *gsGlobal, const GSTEXTURE *Texture, int count, const GSPRIMUVPOINT *vertices);

void gsKit_prim_triangle_texture_3d(GSGLOBAL *gsGlobal, GSTEXTURE *Texture,
float x1, float y1, int iz1, float u1, float v1,
Expand All @@ -139,8 +139,8 @@ void gsKit_prim_triangle_goraud_texture_3d(GSGLOBAL *gsGlobal, GSTEXTURE *Textur
float x3, float y3, int iz3, float u3, float v3,
u64 color1, u64 color2, u64 color3);

void gsKit_prim_list_triangle_goraud_texture_uv_3d(GSGLOBAL *gsGlobal, GSTEXTURE *Texture, int count, const void *vertices);
void gsKit_prim_list_triangle_goraud_texture_stq_3d(GSGLOBAL *gsGlobal, GSTEXTURE *Texture, int count, const void *vertices);
void gsKit_prim_list_triangle_goraud_texture_uv_3d(GSGLOBAL *gsGlobal, GSTEXTURE *Texture, int count, const GSPRIMUVPOINT *vertices);
void gsKit_prim_list_triangle_goraud_texture_stq_3d(GSGLOBAL *gsGlobal, GSTEXTURE *Texture, int count, const GSPRIMSTQPOINT *vertices);

void gsKit_prim_triangle_strip_texture(GSGLOBAL *gsGlobal, GSTEXTURE *Texture,
float *TriStrip, int segments, int iz, u64 color);
Expand Down
6 changes: 3 additions & 3 deletions ee/gs/src/gsPrimitive.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ void gsKit_prim_point(GSGLOBAL *gsGlobal, float x, float y, int iz, u64 color)
#endif

#if F_gsKit_prim_list_points
void gsKit_prim_list_points(GSGLOBAL *gsGlobal, int count, const void *vertices)
void gsKit_prim_list_points(GSGLOBAL *gsGlobal, int count, const GSPRIMPOINT *vertices)
{
u64* p_store;
u64* p_data;
Expand Down Expand Up @@ -139,7 +139,7 @@ void gsKit_prim_line_goraud_3d(GSGLOBAL *gsGlobal, float x1, float y1, int iz1,
#endif

#if F_gsKit_prim_list_line_goraud_3d
void gsKit_prim_list_line_goraud_3d(GSGLOBAL *gsGlobal, int count, const void *vertices)
void gsKit_prim_list_line_goraud_3d(GSGLOBAL *gsGlobal, int count, const GSPRIMPOINT *vertices)
{
u64* p_store;
u64* p_data;
Expand Down Expand Up @@ -492,7 +492,7 @@ void gsKit_prim_triangle_gouraud_3d(GSGLOBAL *gsGlobal, float x1, float y1, int
#endif

#if F_gsKit_prim_list_triangle_gouraud_3d
void gsKit_prim_list_triangle_gouraud_3d(GSGLOBAL *gsGlobal, int count, const void *vertices)
void gsKit_prim_list_triangle_gouraud_3d(GSGLOBAL *gsGlobal, int count, const GSPRIMPOINT *vertices)
{
u64* p_store;
u64* p_data;
Expand Down
6 changes: 3 additions & 3 deletions ee/gs/src/gsTexture.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -690,7 +690,7 @@ void gsKit_prim_sprite_striped_texture_3d(GSGLOBAL *gsGlobal, const GSTEXTURE *T
#endif

#if F_gskit_prim_list_sprite_texture_uv_3d
void gskit_prim_list_sprite_texture_uv_3d(GSGLOBAL *gsGlobal, const GSTEXTURE *Texture, int count, const void *vertices)
void gskit_prim_list_sprite_texture_uv_3d(GSGLOBAL *gsGlobal, const GSTEXTURE *Texture, int count, const GSPRIMUVPOINT *vertices)
{
u64* p_data;
u64* p_store;
Expand Down Expand Up @@ -903,7 +903,7 @@ void gsKit_prim_triangle_goraud_texture_3d(GSGLOBAL *gsGlobal, GSTEXTURE *Textur
#endif

#if F_gsKit_prim_list_triangle_goraud_texture_uv_3d
void gsKit_prim_list_triangle_goraud_texture_uv_3d(GSGLOBAL *gsGlobal, GSTEXTURE *Texture, int count, const void *vertices)
void gsKit_prim_list_triangle_goraud_texture_uv_3d(GSGLOBAL *gsGlobal, GSTEXTURE *Texture, int count, const GSPRIMUVPOINT *vertices)
{
u64* p_data;
u64* p_store;
Expand Down Expand Up @@ -948,7 +948,7 @@ void gsKit_prim_list_triangle_goraud_texture_uv_3d(GSGLOBAL *gsGlobal, GSTEXTURE
#endif

#if F_gsKit_prim_list_triangle_goraud_texture_stq_3d
void gsKit_prim_list_triangle_goraud_texture_stq_3d(GSGLOBAL *gsGlobal, GSTEXTURE *Texture, int count, const void *vertices)
void gsKit_prim_list_triangle_goraud_texture_stq_3d(GSGLOBAL *gsGlobal, GSTEXTURE *Texture, int count, const GSPRIMSTQPOINT *vertices)
{
u64* p_data;
u64* p_store;
Expand Down

0 comments on commit 6a51380

Please sign in to comment.