NepuShiro/libsm64
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Switched needless "DL_INT_SIZE" define to intptr_t.

Browse Source
This commit is contained in:
MeltyPlayer
2022-10-20 12:53:32 -05:00
parent fda9452421
commit 2e2b6de15d
3 changed files with 21 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cpu_type.h
-8
View File
@@ -1,8 +0,0 @@
#pragma once
#ifdef WIN32
#define DL_INT_SIZE int32_t
#endif
#ifdef WIN64
#define DL_INT_SIZE int64_t
#endif
src/gfx_adapter.c
+17 -18
View File
@@ -7,7 +7,6 @@
#include "gfx_adapter.h"
#include "gfx_adapter_commands.h"
#include "load_tex_data.h"
#include "cpu_type.h"
static Mat4 s_curMatrix;
static float s_curColor[3];
@@ -42,7 +41,7 @@ static void convert_uv_to_atlas( float *atlas_uv_out, short tc[] )
static void process_display_list( void *dl )
{
DL_INT_SIZE *ptr = (DL_INT_SIZE *)dl;
intptr_t *ptr = (intptr_t *)dl;
Vtx *vdata = NULL;
for( ;; )
@@ -51,19 +50,19 @@ static void process_display_list( void *dl )
{
case GFXCMD_VertexData:
{
UNUSED DL_INT_SIZE v = *ptr++;
UNUSED DL_INT_SIZE n = *ptr++;
UNUSED DL_INT_SIZE v0 = *ptr++;
UNUSED intptr_t v = *ptr++;
UNUSED intptr_t n = *ptr++;
UNUSED intptr_t v0 = *ptr++;
vdata = (Vtx*)v;
break;
}
case GFXCMD_Triangle:
{
DL_INT_SIZE v00 = *ptr++;
DL_INT_SIZE v01 = *ptr++;
DL_INT_SIZE v02 = *ptr++;
UNUSED DL_INT_SIZE flag0 = *ptr++;
intptr_t v00 = *ptr++;
intptr_t v01 = *ptr++;
intptr_t v02 = *ptr++;
UNUSED intptr_t flag0 = *ptr++;
float x0 = vdata[v00].v.ob[0], y0 = vdata[v00].v.ob[1], z0 = vdata[v00].v.ob[2];
float x1 = vdata[v01].v.ob[0], y1 = vdata[v01].v.ob[1], z1 = vdata[v01].v.ob[2];
@@ -130,8 +129,8 @@ static void process_display_list( void *dl )
case GFXCMD_Light:
{
DL_INT_SIZE l = *ptr++;
DL_INT_SIZE n = *ptr++;
intptr_t l = *ptr++;
intptr_t n = *ptr++;
if( n == 1 )
{
@@ -146,9 +145,9 @@ static void process_display_list( void *dl )
case GFXCMD_Texture:
{
DL_INT_SIZE s = *ptr++;
DL_INT_SIZE t = *ptr++;
DL_INT_SIZE on = *ptr++;
intptr_t s = *ptr++;
intptr_t t = *ptr++;
intptr_t on = *ptr++;
s_scaleS = (uint16_t)s;
s_scaleT = (uint16_t)t;
@@ -159,7 +158,7 @@ static void process_display_list( void *dl )
case GFXCMD_SetTextureImage:
{
DL_INT_SIZE i = *ptr++;
intptr_t i = *ptr++;
s_textureIndex = (int)i;
s_texWidth = mario_tex_widths[s_textureIndex];
@@ -170,8 +169,8 @@ static void process_display_list( void *dl )
case GFXCMD_SetTileSize:
{
DL_INT_SIZE uls = *ptr++;
DL_INT_SIZE ult = *ptr++;
intptr_t uls = *ptr++;
intptr_t ult = *ptr++;
ptr++; // lrs
ptr++; // lrt
@@ -183,7 +182,7 @@ static void process_display_list( void *dl )
case GFXCMD_SubDisplayList:
{
DL_INT_SIZE dl = *ptr++;
intptr_t dl = *ptr++;
process_display_list( (void*)dl );
break;
}
src/gfx_macros.h
+4 -5
View File
@@ -2,7 +2,6 @@
#include "decomp/include/types.h"
#include "gfx_adapter_commands.h"
#include "cpu_type.h"
/*
* Vertex (set up for use with colors)
@@ -75,13 +74,13 @@ typedef struct {
#define G_OFF 0
#define G_TEXTURE_IMAGE_FRAC 2
typedef DL_INT_SIZE Gfx;
typedef intptr_t Gfx;
#define gdSPDefLights1(ar,ag,ab,r1,g1,b1,x1,y1,z1) {{{ {ar,ag,ab},0,{ar,ag,ab},0}}, {{{ {r1,g1,b1},0,{r1,g1,b1},0,{x1,y1,z1},0}}} }
#define gsSPVertex(v, n, v0) \
GFXCMD_VertexData, \
(DL_INT_SIZE)v, n, v0
(intptr_t)v, n, v0
#define gsSP2Triangles(v00, v01, v02, flag0, v10, v11, v12, flag1) \
GFXCMD_Triangle, \
@@ -98,11 +97,11 @@ typedef DL_INT_SIZE Gfx;
#define gsSPDisplayList(dl) \
GFXCMD_SubDisplayList, \
(DL_INT_SIZE)dl
(intptr_t)dl
#define gsSPLight(l, n) \
GFXCMD_Light, \
(DL_INT_SIZE)l, n
(intptr_t)l, n
#define gsSPTexture(s, t, level, tile, on) \
GFXCMD_Texture, \