From f0bd5ca3f2d9c03eb1beaab4ea9deb7d2fd867e9 Mon Sep 17 00:00:00 2001 From: zilmar Date: Wed, 9 Aug 2017 07:32:10 +1000 Subject: [PATCH] [Video] Change FxI32 to int32_t --- Source/Project64-video/Main.cpp | 2 +- Source/Project64-video/Renderer/OGLESgeometry.cpp | 4 ++-- Source/Project64-video/Renderer/OGLESglitchmain.cpp | 4 ++-- Source/Project64-video/Renderer/OGLgeometry.cpp | 4 ++-- Source/Project64-video/Renderer/OGLglitchmain.cpp | 8 ++++---- Source/Project64-video/Renderer/Renderer.h | 8 ++++---- Source/Project64-video/rdp.h | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Source/Project64-video/Main.cpp b/Source/Project64-video/Main.cpp index cbe1193f5..191a6bf45 100644 --- a/Source/Project64-video/Main.cpp +++ b/Source/Project64-video/Main.cpp @@ -485,7 +485,7 @@ int InitGfx() to_fullscreen = FALSE; // 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.tex_min_addr[0] = voodoo.tex_min_addr[1] = gfxTexMinAddress(GFX_TMU0); diff --git a/Source/Project64-video/Renderer/OGLESgeometry.cpp b/Source/Project64-video/Renderer/OGLESgeometry.cpp index a281d33c6..047cb8910 100644 --- a/Source/Project64-video/Renderer/OGLESgeometry.cpp +++ b/Source/Project64-video/Renderer/OGLESgeometry.cpp @@ -143,7 +143,7 @@ void init_geometry() 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); switch (param) @@ -294,7 +294,7 @@ void gfxDepthMask(bool mask) } float biasFactor = 0; -void gfxDepthBiasLevel(FxI32 level) +void gfxDepthBiasLevel(int32_t level) { WriteTrace(TraceGlitch, TraceDebug, "level: %d", level); if (level) diff --git a/Source/Project64-video/Renderer/OGLESglitchmain.cpp b/Source/Project64-video/Renderer/OGLESglitchmain.cpp index 446efea8c..e932e0ed3 100644 --- a/Source/Project64-video/Renderer/OGLESglitchmain.cpp +++ b/Source/Project64-video/Renderer/OGLESglitchmain.cpp @@ -875,7 +875,7 @@ int CheckTextureBufferFormat(gfxChipID_t tmu, uint32_t startAddress, gfxTexInfo 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); switch (pname) @@ -1464,7 +1464,7 @@ bool gfxLfbReadRegion(gfxBuffer_t src_buffer, uint32_t src_x, uint32_t src_y, ui 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 int i, j; diff --git a/Source/Project64-video/Renderer/OGLgeometry.cpp b/Source/Project64-video/Renderer/OGLgeometry.cpp index 30b877069..142211244 100644 --- a/Source/Project64-video/Renderer/OGLgeometry.cpp +++ b/Source/Project64-video/Renderer/OGLgeometry.cpp @@ -73,7 +73,7 @@ void 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); switch (param) @@ -286,7 +286,7 @@ void FindBestDepthBias() grDisplayGLError("FindBestDepthBias"); } -void gfxDepthBiasLevel(FxI32 level) +void gfxDepthBiasLevel(int32_t level) { WriteTrace(TraceGlitch, TraceDebug, "level: %d", level); if (level) diff --git a/Source/Project64-video/Renderer/OGLglitchmain.cpp b/Source/Project64-video/Renderer/OGLglitchmain.cpp index 87904f3a9..2a551e166 100644 --- a/Source/Project64-video/Renderer/OGLglitchmain.cpp +++ b/Source/Project64-video/Renderer/OGLglitchmain.cpp @@ -355,8 +355,8 @@ void gfxClipWindow(uint32_t minx, uint32_t miny, uint32_t maxx, uint32_t maxy) maxy = th - maxy; miny = th - miny; uint32_t tmp = maxy; maxy = miny; miny = tmp; - if ((FxI32)maxx > g_width) maxx = g_width; - if ((FxI32)maxy > g_height) maxy = g_height; + if ((int32_t)maxx > g_width) maxx = g_width; + if ((int32_t)maxy > g_height) maxy = g_height; if (int(minx) < 0) minx = 0; if (int(miny) < 0) miny = 0; if (maxx < minx) maxx = minx; @@ -1179,7 +1179,7 @@ int CheckTextureBufferFormat(gfxChipID_t tmu, uint32_t startAddress, gfxTexInfo 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); switch (pname) @@ -1746,7 +1746,7 @@ bool gfxLfbReadRegion(gfxBuffer_t src_buffer, uint32_t src_x, uint32_t src_y, ui 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 int i, j; diff --git a/Source/Project64-video/Renderer/Renderer.h b/Source/Project64-video/Renderer/Renderer.h index 883d734c8..e13fbb850 100644 --- a/Source/Project64-video/Renderer/Renderer.h +++ b/Source/Project64-video/Renderer/Renderer.h @@ -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 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 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 gfxDepthBufferMode(gfxDepthBufferMode_t mode); void gfxDepthBufferFunction(gfxCmpFnc_t function); void gfxDepthMask(bool mask); 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 gfxDrawVertexArray(uint32_t mode, uint32_t Count, void *pointers2); 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); 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 gfxBufferClear(gfxColor_t color, gfxAlpha_t alpha, uint32_t depth); 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 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 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); 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); diff --git a/Source/Project64-video/rdp.h b/Source/Project64-video/rdp.h index 5102eeb42..493f465e4 100644 --- a/Source/Project64-video/rdp.h +++ b/Source/Project64-video/rdp.h @@ -159,7 +159,7 @@ typedef struct int sup_32bit_tex; int has_2mb_tex_boundary; int gamma_correction; - FxI32 gamma_table_size; + int32_t gamma_table_size; uint32_t *gamma_table_r; uint32_t *gamma_table_g; uint32_t *gamma_table_b;