ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Video] Change FxI32 to int32_t

This commit is contained in:
zilmar 2017-08-09 07:32:10 +10:00
parent a361cf8947
commit f0bd5ca3f2
7 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Project64-video/Main.cpp
View File

@ -485,7 +485,7 @@ int InitGfx()
to_fullscreen = FALSE; to_fullscreen = FALSE;
// get maximal texture size // get maximal texture size
gfxGet(GR_MAX_TEXTURE_SIZE, 4, (FxI32*)&voodoo.max_tex_size); gfxGet(GR_MAX_TEXTURE_SIZE, 4, (int32_t*)&voodoo.max_tex_size);
voodoo.sup_large_tex = (voodoo.max_tex_size > 256 && !g_settings->hacks(CSettings::hack_PPL)); voodoo.sup_large_tex = (voodoo.max_tex_size > 256 && !g_settings->hacks(CSettings::hack_PPL));
voodoo.tex_min_addr[0] = voodoo.tex_min_addr[1] = gfxTexMinAddress(GFX_TMU0); voodoo.tex_min_addr[0] = voodoo.tex_min_addr[1] = gfxTexMinAddress(GFX_TMU0);

4
Source/Project64-video/Renderer/OGLESgeometry.cpp
View File

@ -143,7 +143,7 @@ void init_geometry()
glDisable(GL_DEPTH_TEST); glDisable(GL_DEPTH_TEST);
} }
void gfxVertexLayout(uint32_t param, FxI32 offset, uint32_t mode) void gfxVertexLayout(uint32_t param, int32_t offset, uint32_t mode)
{ {
WriteTrace(TraceGlitch, TraceDebug, "param: %d offset: %d mode: %d", param, offset, mode); WriteTrace(TraceGlitch, TraceDebug, "param: %d offset: %d mode: %d", param, offset, mode);
switch (param) switch (param)
@ -294,7 +294,7 @@ void gfxDepthMask(bool mask)
} }
float biasFactor = 0; float biasFactor = 0;
void gfxDepthBiasLevel(FxI32 level) void gfxDepthBiasLevel(int32_t level)
{ {
WriteTrace(TraceGlitch, TraceDebug, "level: %d", level); WriteTrace(TraceGlitch, TraceDebug, "level: %d", level);
if (level) if (level)

4
Source/Project64-video/Renderer/OGLESglitchmain.cpp
View File

@ -875,7 +875,7 @@ int CheckTextureBufferFormat(gfxChipID_t tmu, uint32_t startAddress, gfxTexInfo
return 0; return 0;
} }
uint32_t gfxGet(uint32_t pname, uint32_t plength, FxI32 *params) uint32_t gfxGet(uint32_t pname, uint32_t plength, int32_t *params)
{ {
WriteTrace(TraceGlitch, TraceDebug, "pname: %d plength: %d", pname, plength); WriteTrace(TraceGlitch, TraceDebug, "pname: %d plength: %d", pname, plength);
switch (pname) switch (pname)
@ -1464,7 +1464,7 @@ bool gfxLfbReadRegion(gfxBuffer_t src_buffer, uint32_t src_x, uint32_t src_y, ui
return FXTRUE; return FXTRUE;
} }
bool gfxLfbWriteRegion(gfxBuffer_t dst_buffer, uint32_t dst_x, uint32_t dst_y, gfxLfbSrcFmt_t src_format, uint32_t src_width, uint32_t src_height, bool pixelPipeline, FxI32 src_stride, void *src_data) bool gfxLfbWriteRegion(gfxBuffer_t dst_buffer, uint32_t dst_x, uint32_t dst_y, gfxLfbSrcFmt_t src_format, uint32_t src_width, uint32_t src_height, bool pixelPipeline, int32_t src_stride, void *src_data)
{ {
unsigned char *buf; unsigned char *buf;
unsigned int i, j; unsigned int i, j;

4
Source/Project64-video/Renderer/OGLgeometry.cpp
View File

@ -73,7 +73,7 @@ void init_geometry()
grDisplayGLError("init_geometry"); grDisplayGLError("init_geometry");
} }
void gfxVertexLayout(uint32_t param, FxI32 offset, uint32_t mode) void gfxVertexLayout(uint32_t param, int32_t offset, uint32_t mode)
{ {
WriteTrace(TraceGlitch, TraceDebug, "param: %d offset: %d mode: %d", param, offset, mode); WriteTrace(TraceGlitch, TraceDebug, "param: %d offset: %d mode: %d", param, offset, mode);
switch (param) switch (param)
@ -286,7 +286,7 @@ void FindBestDepthBias()
grDisplayGLError("FindBestDepthBias"); grDisplayGLError("FindBestDepthBias");
} }
void gfxDepthBiasLevel(FxI32 level) void gfxDepthBiasLevel(int32_t level)
{ {
WriteTrace(TraceGlitch, TraceDebug, "level: %d", level); WriteTrace(TraceGlitch, TraceDebug, "level: %d", level);
if (level) if (level)

8
Source/Project64-video/Renderer/OGLglitchmain.cpp
View File

@ -355,8 +355,8 @@ void gfxClipWindow(uint32_t minx, uint32_t miny, uint32_t maxx, uint32_t maxy)
maxy = th - maxy; maxy = th - maxy;
miny = th - miny; miny = th - miny;
uint32_t tmp = maxy; maxy = miny; miny = tmp; uint32_t tmp = maxy; maxy = miny; miny = tmp;
if ((FxI32)maxx > g_width) maxx = g_width; if ((int32_t)maxx > g_width) maxx = g_width;
if ((FxI32)maxy > g_height) maxy = g_height; if ((int32_t)maxy > g_height) maxy = g_height;
if (int(minx) < 0) minx = 0; if (int(minx) < 0) minx = 0;
if (int(miny) < 0) miny = 0; if (int(miny) < 0) miny = 0;
if (maxx < minx) maxx = minx; if (maxx < minx) maxx = minx;
@ -1179,7 +1179,7 @@ int CheckTextureBufferFormat(gfxChipID_t tmu, uint32_t startAddress, gfxTexInfo
return 0; return 0;
} }
uint32_t gfxGet(uint32_t pname, uint32_t plength, FxI32 *params) uint32_t gfxGet(uint32_t pname, uint32_t plength, int32_t *params)
{ {
WriteTrace(TraceGlitch, TraceDebug, "pname: %d plength: %d", pname, plength); WriteTrace(TraceGlitch, TraceDebug, "pname: %d plength: %d", pname, plength);
switch (pname) switch (pname)
@ -1746,7 +1746,7 @@ bool gfxLfbReadRegion(gfxBuffer_t src_buffer, uint32_t src_x, uint32_t src_y, ui
return FXTRUE; return FXTRUE;
} }
bool gfxLfbWriteRegion(gfxBuffer_t dst_buffer, uint32_t dst_x, uint32_t dst_y, gfxLfbSrcFmt_t src_format, uint32_t src_width, uint32_t src_height, bool pixelPipeline, FxI32 src_stride, void *src_data) bool gfxLfbWriteRegion(gfxBuffer_t dst_buffer, uint32_t dst_x, uint32_t dst_y, gfxLfbSrcFmt_t src_format, uint32_t src_width, uint32_t src_height, bool pixelPipeline, int32_t src_stride, void *src_data)
{ {
unsigned char *buf; unsigned char *buf;
unsigned int i, j; unsigned int i, j;

8
Source/Project64-video/Renderer/Renderer.h
View File

@ -40,27 +40,27 @@ void gfxAlphaCombineExt(gfxACUColor_t a, gfxCombineMode_t a_mode, gfxACUColor_t
void gfxTexColorCombineExt(gfxChipID_t tmu, gfxTCCUColor_t a, gfxCombineMode_t a_mode, gfxTCCUColor_t b, gfxCombineMode_t b_mode, gfxTCCUColor_t c, bool c_invert, gfxTCCUColor_t d, bool d_invert, uint32_t shift, bool invert); void gfxTexColorCombineExt(gfxChipID_t tmu, gfxTCCUColor_t a, gfxCombineMode_t a_mode, gfxTCCUColor_t b, gfxCombineMode_t b_mode, gfxTCCUColor_t c, bool c_invert, gfxTCCUColor_t d, bool d_invert, uint32_t shift, bool invert);
void gfxTexAlphaCombineExt(gfxChipID_t tmu, gfxTACUColor_t a, gfxCombineMode_t a_mode, gfxTACUColor_t b, gfxCombineMode_t b_mode, gfxTACUColor_t c, bool c_invert, gfxTACUColor_t d, bool d_invert, uint32_t shift, bool invert); void gfxTexAlphaCombineExt(gfxChipID_t tmu, gfxTACUColor_t a, gfxCombineMode_t a_mode, gfxTACUColor_t b, gfxCombineMode_t b_mode, gfxTACUColor_t c, bool c_invert, gfxTACUColor_t d, bool d_invert, uint32_t shift, bool invert);
void gfxConstantColorValueExt(gfxChipID_t tmu, gfxColor_t value); void gfxConstantColorValueExt(gfxChipID_t tmu, gfxColor_t value);
void gfxVertexLayout(uint32_t param, FxI32 offset, uint32_t mode); void gfxVertexLayout(uint32_t param, int32_t offset, uint32_t mode);
void gfxCullMode(gfxCullMode_t mode); void gfxCullMode(gfxCullMode_t mode);
void gfxDepthBufferMode(gfxDepthBufferMode_t mode); void gfxDepthBufferMode(gfxDepthBufferMode_t mode);
void gfxDepthBufferFunction(gfxCmpFnc_t function); void gfxDepthBufferFunction(gfxCmpFnc_t function);
void gfxDepthMask(bool mask); void gfxDepthMask(bool mask);
void gfxDrawTriangle(const void *a, const void *b, const void *c); void gfxDrawTriangle(const void *a, const void *b, const void *c);
void gfxDepthBiasLevel(FxI32 level); void gfxDepthBiasLevel(int32_t level);
void gfxDrawLine(const void *a, const void *b); void gfxDrawLine(const void *a, const void *b);
void gfxDrawVertexArray(uint32_t mode, uint32_t Count, void *pointers2); void gfxDrawVertexArray(uint32_t mode, uint32_t Count, void *pointers2);
void gfxDrawVertexArrayContiguous(uint32_t mode, uint32_t Count, void *pointers, uint32_t stride); void gfxDrawVertexArrayContiguous(uint32_t mode, uint32_t Count, void *pointers, uint32_t stride);
bool gfxSstWinOpen(gfxColorFormat_t color_format, gfxOriginLocation_t origin_location, int nColBuffers, int nAuxBuffers); bool gfxSstWinOpen(gfxColorFormat_t color_format, gfxOriginLocation_t origin_location, int nColBuffers, int nAuxBuffers);
void gfxAuxBufferExt(gfxBuffer_t buffer); void gfxAuxBufferExt(gfxBuffer_t buffer);
uint32_t gfxGet(uint32_t pname, uint32_t plength, FxI32 *params); uint32_t gfxGet(uint32_t pname, uint32_t plength, int32_t *params);
void gfxRenderBuffer(gfxBuffer_t buffer); void gfxRenderBuffer(gfxBuffer_t buffer);
void gfxBufferClear(gfxColor_t color, gfxAlpha_t alpha, uint32_t depth); void gfxBufferClear(gfxColor_t color, gfxAlpha_t alpha, uint32_t depth);
void gfxBufferSwap(uint32_t swap_interval); void gfxBufferSwap(uint32_t swap_interval);
bool gfxLfbLock(gfxLock_t type, gfxBuffer_t buffer, gfxLfbWriteMode_t writeMode, gfxOriginLocation_t origin, bool pixelPipeline, gfxLfbInfo_t *info); bool gfxLfbLock(gfxLock_t type, gfxBuffer_t buffer, gfxLfbWriteMode_t writeMode, gfxOriginLocation_t origin, bool pixelPipeline, gfxLfbInfo_t *info);
bool gfxLfbUnlock(gfxLock_t type, gfxBuffer_t buffer); bool gfxLfbUnlock(gfxLock_t type, gfxBuffer_t buffer);
bool gfxLfbReadRegion(gfxBuffer_t src_buffer, uint32_t src_x, uint32_t src_y, uint32_t src_width, uint32_t src_height, uint32_t dst_stride, void *dst_data); bool gfxLfbReadRegion(gfxBuffer_t src_buffer, uint32_t src_x, uint32_t src_y, uint32_t src_width, uint32_t src_height, uint32_t dst_stride, void *dst_data);
bool gfxLfbWriteRegion(gfxBuffer_t dst_buffer, uint32_t dst_x, uint32_t dst_y, gfxLfbSrcFmt_t src_format, uint32_t src_width, uint32_t src_height, bool pixelPipeline, FxI32 src_stride, void *src_data); bool gfxLfbWriteRegion(gfxBuffer_t dst_buffer, uint32_t dst_x, uint32_t dst_y, gfxLfbSrcFmt_t src_format, uint32_t src_width, uint32_t src_height, bool pixelPipeline, int32_t src_stride, void *src_data);
uint32_t gfxTexCalcMemRequired(gfxLOD_t lodmin, gfxLOD_t lodmax, gfxAspectRatio_t aspect, gfxTextureFormat_t fmt); uint32_t gfxTexCalcMemRequired(gfxLOD_t lodmin, gfxLOD_t lodmax, gfxAspectRatio_t aspect, gfxTextureFormat_t fmt);
void gfxLoadGammaTable(uint32_t nentries, uint32_t *red, uint32_t *green, uint32_t *blue); void gfxLoadGammaTable(uint32_t nentries, uint32_t *red, uint32_t *green, uint32_t *blue);
void gfxGetGammaTableExt(uint32_t /*nentries*/, uint32_t *red, uint32_t *green, uint32_t *blue); void gfxGetGammaTableExt(uint32_t /*nentries*/, uint32_t *red, uint32_t *green, uint32_t *blue);

2
Source/Project64-video/rdp.h
View File

@ -159,7 +159,7 @@ typedef struct
int sup_32bit_tex; int sup_32bit_tex;
int has_2mb_tex_boundary; int has_2mb_tex_boundary;
int gamma_correction; int gamma_correction;
FxI32 gamma_table_size; int32_t gamma_table_size;
uint32_t *gamma_table_r; uint32_t *gamma_table_r;
uint32_t *gamma_table_g; uint32_t *gamma_table_g;
uint32_t *gamma_table_b; uint32_t *gamma_table_b;