From 8054de6bf65c32fac99c48b0fb0aa7f58f457921 Mon Sep 17 00:00:00 2001 From: zilmar Date: Sun, 23 Jul 2017 08:42:02 +1000 Subject: [PATCH] [Video] Change FxU32 to uint32_t --- Source/Project64-video/Main.cpp | 6 +-- .../Renderer/OGLEScombiner.cpp | 8 ++-- .../Renderer/OGLESgeometry.cpp | 6 +-- .../Renderer/OGLESglitchmain.cpp | 32 +++++++------- .../Renderer/OGLEStextures.cpp | 26 +++++------ .../Project64-video/Renderer/OGLcombiner.cpp | 8 ++-- .../Project64-video/Renderer/OGLgeometry.cpp | 6 +-- .../Renderer/OGLglitchmain.cpp | 26 +++++------ .../Project64-video/Renderer/OGLtextures.cpp | 26 +++++------ Source/Project64-video/Renderer/Renderer.h | 44 +++++++++---------- Source/Project64-video/rdp.h | 6 +-- 11 files changed, 97 insertions(+), 97 deletions(-) diff --git a/Source/Project64-video/Main.cpp b/Source/Project64-video/Main.cpp index d35d4bb6b..91b3a4c8a 100644 --- a/Source/Project64-video/Main.cpp +++ b/Source/Project64-video/Main.cpp @@ -1196,9 +1196,9 @@ static void DrawWholeFrameBufferToScreen() static void GetGammaTable() { - voodoo.gamma_table_r = new FxU32[voodoo.gamma_table_size]; - voodoo.gamma_table_g = new FxU32[voodoo.gamma_table_size]; - voodoo.gamma_table_b = new FxU32[voodoo.gamma_table_size]; + voodoo.gamma_table_r = new uint32_t[voodoo.gamma_table_size]; + voodoo.gamma_table_g = new uint32_t[voodoo.gamma_table_size]; + voodoo.gamma_table_b = new uint32_t[voodoo.gamma_table_size]; gfxGetGammaTableExt(voodoo.gamma_table_size, voodoo.gamma_table_r, voodoo.gamma_table_g, voodoo.gamma_table_b); } diff --git a/Source/Project64-video/Renderer/OGLEScombiner.cpp b/Source/Project64-video/Renderer/OGLEScombiner.cpp index 3f2f69d18..fd6d1ddbe 100644 --- a/Source/Project64-video/Renderer/OGLEScombiner.cpp +++ b/Source/Project64-video/Renderer/OGLEScombiner.cpp @@ -1727,7 +1727,7 @@ void gfxStippleMode(GrStippleMode_t mode) need_to_compile = 1; } -void gfxColorCombineExt(gfxCCUColor_t a, gfxCombineMode_t a_mode, gfxCCUColor_t b, gfxCombineMode_t b_mode, gfxCCUColor_t c, FxBool c_invert, gfxCCUColor_t d, FxBool d_invert, FxU32 shift, FxBool invert) +void gfxColorCombineExt(gfxCCUColor_t a, gfxCombineMode_t a_mode, gfxCCUColor_t b, gfxCombineMode_t b_mode, gfxCCUColor_t c, FxBool c_invert, gfxCCUColor_t d, FxBool d_invert, uint32_t shift, FxBool invert) { WriteTrace(TraceGlitch, TraceDebug, "a: %d a_mode: %d b: %d b_mode: %d c: %d c_invert: %d d: %d d_invert: %d shift: %d invert: %d", a, a_mode, b, b_mode, c, c_invert, d, d_invert, shift, invert); if (invert) WriteTrace(TraceGlitch, TraceWarning, "gfxColorCombineExt : inverted result"); @@ -1904,7 +1904,7 @@ void gfxColorCombineExt(gfxCCUColor_t a, gfxCombineMode_t a_mode, gfxCCUColor_t need_to_compile = 1; } -void gfxAlphaCombineExt(gfxACUColor_t a, gfxCombineMode_t a_mode, gfxACUColor_t b, gfxCombineMode_t b_mode, gfxACUColor_t c, FxBool c_invert, gfxACUColor_t d, FxBool d_invert, FxU32 shift, FxBool invert) +void gfxAlphaCombineExt(gfxACUColor_t a, gfxCombineMode_t a_mode, gfxACUColor_t b, gfxCombineMode_t b_mode, gfxACUColor_t c, FxBool c_invert, gfxACUColor_t d, FxBool d_invert, uint32_t shift, FxBool invert) { WriteTrace(TraceGlitch, TraceDebug, "a: %d a_mode: %d b: %d b_mode: %d c: %d c_invert: %d d: %d d_invert: %d shift: %d invert: %d", a, a_mode, b, b_mode, c, c_invert, d, d_invert, shift, invert); if (invert) WriteTrace(TraceGlitch, TraceWarning, "gfxAlphaCombineExt : inverted result"); @@ -2051,7 +2051,7 @@ void gfxAlphaCombineExt(gfxACUColor_t a, gfxCombineMode_t a_mode, gfxACUColor_t need_to_compile = 1; } -void gfxTexColorCombineExt(GrChipID_t tmu, gfxTCCUColor_t a, gfxCombineMode_t a_mode, gfxTCCUColor_t b, gfxCombineMode_t b_mode, gfxTCCUColor_t c, FxBool c_invert, gfxTCCUColor_t d, FxBool d_invert, FxU32 shift, FxBool invert) +void gfxTexColorCombineExt(GrChipID_t tmu, gfxTCCUColor_t a, gfxCombineMode_t a_mode, gfxTCCUColor_t b, gfxCombineMode_t b_mode, gfxTCCUColor_t c, FxBool c_invert, gfxTCCUColor_t d, FxBool d_invert, uint32_t shift, FxBool invert) { int num_tex; WriteTrace(TraceGlitch, TraceDebug, "tmu: %d a: %d a_mode: %d b: %d b_mode: %d c: %d c_invert: %d d: %d d_invert: %d shift: %d invert: %d", tmu, a, a_mode, b, b_mode, c, c_invert, d, d_invert, shift, invert); @@ -2410,7 +2410,7 @@ void gfxTexColorCombineExt(GrChipID_t tmu, gfxTCCUColor_t a, gfxCombineMode_t a_ need_to_compile = 1; } -void gfxTexAlphaCombineExt(GrChipID_t tmu, gfxTACUColor_t a, gfxCombineMode_t a_mode, gfxTACUColor_t b, gfxCombineMode_t b_mode, gfxTACUColor_t c, FxBool c_invert, gfxTACUColor_t d, FxBool d_invert, FxU32 shift, FxBool invert) +void gfxTexAlphaCombineExt(GrChipID_t tmu, gfxTACUColor_t a, gfxCombineMode_t a_mode, gfxTACUColor_t b, gfxCombineMode_t b_mode, gfxTACUColor_t c, FxBool c_invert, gfxTACUColor_t d, FxBool d_invert, uint32_t shift, FxBool invert) { int num_tex; WriteTrace(TraceGlitch, TraceDebug, "tmu: %d a: %d a_mode: %d b: %d b_mode: %d c: %d c_invert: %d d: %d d_invert: %d shift, invert: %d", tmu, a, a_mode, b, b_mode, c, c_invert, d, d_invert, shift, invert); diff --git a/Source/Project64-video/Renderer/OGLESgeometry.cpp b/Source/Project64-video/Renderer/OGLESgeometry.cpp index b588368b0..3c3e5f5a9 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(FxU32 param, FxI32 offset, FxU32 mode) +void gfxVertexLayout(uint32_t param, FxI32 offset, uint32_t mode) { WriteTrace(TraceGlitch, TraceDebug, "param: %d offset: %d mode: %d", param, offset, mode); switch (param) @@ -348,7 +348,7 @@ void gfxDrawLine(const void *a, const void *b) { } -void gfxDrawVertexArray(FxU32 mode, FxU32 Count, void *pointers2) +void gfxDrawVertexArray(uint32_t mode, uint32_t Count, void *pointers2) { void **pointers = (void**)pointers2; WriteTrace(TraceGlitch, TraceDebug, "gfxDrawVertexArray(%d,%d)\r\n", mode, Count); @@ -372,7 +372,7 @@ void gfxDrawVertexArray(FxU32 mode, FxU32 Count, void *pointers2) vbo_buffer(GL_TRIANGLE_FAN, 0, Count, pointers[0]); } -void gfxDrawVertexArrayContiguous(FxU32 mode, FxU32 Count, void *pointers, FxU32 stride) +void gfxDrawVertexArrayContiguous(uint32_t mode, uint32_t Count, void *pointers, uint32_t stride) { WriteTrace(TraceGlitch, TraceDebug, "gfxDrawVertexArrayContiguous(%d,%d,%d)\r\n", mode, Count, stride); diff --git a/Source/Project64-video/Renderer/OGLESglitchmain.cpp b/Source/Project64-video/Renderer/OGLESglitchmain.cpp index 9ab65e505..21da57812 100644 --- a/Source/Project64-video/Renderer/OGLESglitchmain.cpp +++ b/Source/Project64-video/Renderer/OGLESglitchmain.cpp @@ -175,7 +175,7 @@ static unsigned int curBufferAddr = 0; struct TMU_USAGE { int min, max; } tmu_usage[2] = { { 0xfffffff, 0 }, { 0xfffffff, 0 } }; struct texbuf_t { - FxU32 start, end; + uint32_t start, end; int fmt; }; #define NB_TEXBUFS 128 // MUST be a power of two @@ -204,7 +204,7 @@ void display_warning(const char *text, ...) } } -void gfxClipWindow(FxU32 minx, FxU32 miny, FxU32 maxx, FxU32 maxy) +void gfxClipWindow(uint32_t minx, uint32_t miny, uint32_t maxx, uint32_t maxy) { WriteTrace(TraceGlitch, TraceDebug, "minx = %d, miny: %d maxx: %d maxy: %d", minx, miny, maxx, maxy); @@ -225,9 +225,9 @@ void gfxClipWindow(FxU32 minx, FxU32 miny, FxU32 maxx, FxU32 maxy) th = screen_height; maxy = th - maxy; miny = th - miny; - FxU32 tmp = maxy; maxy = miny; miny = tmp; - if (maxx > (FxU32)g_width) maxx = g_width; - if (maxy > (FxU32)g_height) maxy = g_height; + uint32_t tmp = maxy; maxy = miny; miny = tmp; + if (maxx > (uint32_t)g_width) maxx = g_width; + if (maxy > (uint32_t)g_height) maxy = g_height; if (int(minx) < 0) minx = 0; if (int(miny) < 0) miny = 0; if (maxx < minx) maxx = minx; @@ -315,7 +315,7 @@ int isWglExtensionSupported(const char *extension) #ifdef _WIN32 # include # ifndef ATTACH_PARENT_PROCESS -# define ATTACH_PARENT_PROCESS ((FxU32)-1) +# define ATTACH_PARENT_PROCESS ((uint32_t)-1) # endif #endif @@ -563,7 +563,7 @@ FxBool gfxSstWinClose(GrContext_t context) return FXTRUE; } -void gfxTextureBufferExt(GrChipID_t tmu, FxU32 startAddress, GrLOD_t lodmin, GrLOD_t lodmax, GrAspectRatio_t aspect, GrTextureFormat_t fmt, FxU32 evenOdd) +void gfxTextureBufferExt(GrChipID_t tmu, uint32_t startAddress, GrLOD_t lodmin, GrLOD_t lodmax, GrAspectRatio_t aspect, GrTextureFormat_t fmt, uint32_t evenOdd) { int i; static int fbs_init = 0; @@ -789,12 +789,12 @@ void gfxTextureBufferExt(GrChipID_t tmu, FxU32 startAddress, GrLOD_t lodmin, GrL } } -int CheckTextureBufferFormat(GrChipID_t tmu, FxU32 startAddress, GrTexInfo *info) +int CheckTextureBufferFormat(GrChipID_t tmu, uint32_t startAddress, GrTexInfo *info) { int found, i; if (!use_fbo) { for (found = i = 0; i < 2; i++) - if ((FxU32)tmu_usage[i].min <= startAddress && (FxU32)tmu_usage[i].max > startAddress) { + if ((uint32_t)tmu_usage[i].min <= startAddress && (uint32_t)tmu_usage[i].max > startAddress) { //printf("tmu %d == framebuffer %x\n", tmu, startAddress); found = 1; break; @@ -875,7 +875,7 @@ int CheckTextureBufferFormat(GrChipID_t tmu, FxU32 startAddress, GrTexInfo *info return 0; } -FxU32 gfxGet(FxU32 pname, FxU32 plength, FxI32 *params) +uint32_t gfxGet(uint32_t pname, uint32_t plength, FxI32 *params) { WriteTrace(TraceGlitch, TraceDebug, "pname: %d plength: %d", pname, plength); switch (pname) @@ -1304,7 +1304,7 @@ void gfxAuxBufferExt(GrBuffer_t buffer) } } -void gfxBufferClear(GrColor_t color, gfxAlpha_t alpha, FxU32 depth) +void gfxBufferClear(GrColor_t color, gfxAlpha_t alpha, uint32_t depth) { WriteTrace(TraceGlitch, TraceDebug, "color: %d alpha: %d depth: %d", color, alpha, depth); vbo_draw(); @@ -1338,7 +1338,7 @@ void gfxBufferClear(GrColor_t color, gfxAlpha_t alpha, FxU32 depth) buffer_cleared = 1; } -void gfxBufferSwap(FxU32 swap_interval) +void gfxBufferSwap(uint32_t swap_interval) { // GLuint program; @@ -1449,7 +1449,7 @@ FxBool gfxLfbUnlock(GrLock_t type, GrBuffer_t buffer) return FXTRUE; } -FxBool gfxLfbReadRegion(GrBuffer_t src_buffer, FxU32 src_x, FxU32 src_y, FxU32 src_width, FxU32 src_height, FxU32 dst_stride, void *dst_data) +FxBool gfxLfbReadRegion(GrBuffer_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) { unsigned char *buf; unsigned int i, j; @@ -1510,7 +1510,7 @@ FxBool gfxLfbReadRegion(GrBuffer_t src_buffer, FxU32 src_x, FxU32 src_y, FxU32 s return FXTRUE; } -FxBool gfxLfbWriteRegion(GrBuffer_t dst_buffer, FxU32 dst_x, FxU32 dst_y, GrLfbSrcFmt_t src_format, FxU32 src_width, FxU32 src_height, FxBool pixelPipeline, FxI32 src_stride, void *src_data) +FxBool gfxLfbWriteRegion(GrBuffer_t dst_buffer, uint32_t dst_x, uint32_t dst_y, GrLfbSrcFmt_t src_format, uint32_t src_width, uint32_t src_height, FxBool pixelPipeline, FxI32 src_stride, void *src_data) { unsigned char *buf; unsigned int i, j; @@ -1637,11 +1637,11 @@ FxBool gfxLfbWriteRegion(GrBuffer_t dst_buffer, FxU32 dst_x, FxU32 dst_y, GrLfbS } /* wrapper-specific glide extensions */ -void gfxLoadGammaTable(FxU32 nentries, FxU32 *red, FxU32 *green, FxU32 *blue) +void gfxLoadGammaTable(uint32_t nentries, uint32_t *red, uint32_t *green, uint32_t *blue) { } -void gfxGetGammaTableExt(FxU32 nentries, FxU32 *red, FxU32 *green, FxU32 *blue) +void gfxGetGammaTableExt(uint32_t nentries, uint32_t *red, uint32_t *green, uint32_t *blue) { return; } diff --git a/Source/Project64-video/Renderer/OGLEStextures.cpp b/Source/Project64-video/Renderer/OGLEStextures.cpp index 93af886e6..1ea4e6cd2 100644 --- a/Source/Project64-video/Renderer/OGLEStextures.cpp +++ b/Source/Project64-video/Renderer/OGLEStextures.cpp @@ -138,19 +138,19 @@ void free_textures() } } -FxU32 gfxTexMinAddress(GrChipID_t tmu) +uint32_t gfxTexMinAddress(GrChipID_t tmu) { WriteTrace(TraceGlitch, TraceDebug, "tmu = %d", tmu); return 0; } -FxU32 gfxTexMaxAddress(GrChipID_t tmu) +uint32_t gfxTexMaxAddress(GrChipID_t tmu) { WriteTrace(TraceGlitch, TraceDebug, "tmu = %d", tmu); return TMU_SIZE * 2 - 1; } -FxU32 gfxTexTextureMemRequired(FxU32 evenOdd, GrTexInfo *info) +uint32_t gfxTexTextureMemRequired(uint32_t evenOdd, GrTexInfo *info) { WriteTrace(TraceGlitch, TraceDebug, "evenOdd = %d", evenOdd); int width, height; @@ -197,7 +197,7 @@ FxU32 gfxTexTextureMemRequired(FxU32 evenOdd, GrTexInfo *info) return 0; } -FxU32 gfxTexCalcMemRequired(GrLOD_t lodmin, GrLOD_t lodmax, GrAspectRatio_t aspect, GrTextureFormat_t fmt) +uint32_t gfxTexCalcMemRequired(GrLOD_t lodmin, GrLOD_t lodmax, GrAspectRatio_t aspect, GrTextureFormat_t fmt) { WriteTrace(TraceGlitch, TraceDebug, "lodmin = %d, lodmax: %d aspect: %d fmt: %d", lodmin, lodmax, aspect, fmt); int width, height; @@ -375,7 +375,7 @@ int grTexFormat2GLPackedFmt(int fmt, int * gltexfmt, int * glpixfmt, int * glpac */ } -void gfxTexDownloadMipMap(GrChipID_t tmu, FxU32 startAddress, FxU32 evenOdd, GrTexInfo *info) +void gfxTexDownloadMipMap(GrChipID_t tmu, uint32_t startAddress, uint32_t evenOdd, GrTexInfo *info) { WriteTrace(TraceGlitch, TraceDebug, "tmu = %d, startAddress: %d evenOdd: %d", tmu, startAddress, evenOdd); int width, height, i, j; @@ -482,7 +482,7 @@ void gfxTexDownloadMipMap(GrChipID_t tmu, FxU32 startAddress, FxU32 evenOdd, GrT m++; n++; } - } + } factor = 2; glformat = GL_RGB; break; @@ -505,7 +505,7 @@ void gfxTexDownloadMipMap(GrChipID_t tmu, FxU32 startAddress, FxU32 evenOdd, GrT m++; n++; } - } + } factor = 2; glformat = GL_RGBA; break; @@ -544,7 +544,7 @@ void gfxTexDownloadMipMap(GrChipID_t tmu, FxU32 startAddress, FxU32 evenOdd, GrT m++; n++; } - } + } factor = 2; glformat = GL_RGBA; break; @@ -587,8 +587,8 @@ void gfxTexDownloadMipMap(GrChipID_t tmu, FxU32 startAddress, FxU32 evenOdd, GrT default: WriteTrace(TraceGlitch, TraceWarning, "gfxTexDownloadMipMap : unknown texture format: %x", info->format); factor = 0; - } - } + } + } glActiveTexture(GL_TEXTURE2); @@ -629,11 +629,11 @@ void gfxTexDownloadMipMap(GrChipID_t tmu, FxU32 startAddress, FxU32 evenOdd, GrT */ glBindTexture(GL_TEXTURE_2D, default_texture); - } +} -int CheckTextureBufferFormat(GrChipID_t tmu, FxU32 startAddress, GrTexInfo *info); +int CheckTextureBufferFormat(GrChipID_t tmu, uint32_t startAddress, GrTexInfo *info); -void gfxTexSource(GrChipID_t tmu, FxU32 startAddress, FxU32 evenOdd, GrTexInfo *info) +void gfxTexSource(GrChipID_t tmu, uint32_t startAddress, uint32_t evenOdd, GrTexInfo *info) { WriteTrace(TraceGlitch, TraceDebug, "tmu = %d, startAddress: %d evenOdd: %d", tmu, startAddress, evenOdd); diff --git a/Source/Project64-video/Renderer/OGLcombiner.cpp b/Source/Project64-video/Renderer/OGLcombiner.cpp index 7087a3006..b23e39a56 100644 --- a/Source/Project64-video/Renderer/OGLcombiner.cpp +++ b/Source/Project64-video/Renderer/OGLcombiner.cpp @@ -1690,7 +1690,7 @@ void gfxStippleMode(GrStippleMode_t mode) grDisplayGLError("gfxStippleMode"); } -void gfxColorCombineExt(gfxCCUColor_t a, gfxCombineMode_t a_mode, gfxCCUColor_t b, gfxCombineMode_t b_mode, gfxCCUColor_t c, FxBool c_invert, gfxCCUColor_t d, FxBool d_invert, FxU32 shift, FxBool invert) +void gfxColorCombineExt(gfxCCUColor_t a, gfxCombineMode_t a_mode, gfxCCUColor_t b, gfxCombineMode_t b_mode, gfxCCUColor_t c, FxBool c_invert, gfxCCUColor_t d, FxBool d_invert, uint32_t shift, FxBool invert) { WriteTrace(TraceGlitch, TraceDebug, "a: %d a_mode: %d b: %d b_mode: %d c: %d c_invert: %d d: %d d_invert: %d shift: %d invert: %d", a, a_mode, b, b_mode, c, c_invert, d, d_invert, shift, invert); if (invert) WriteTrace(TraceGlitch, TraceWarning, "gfxColorCombineExt : inverted result"); @@ -1867,7 +1867,7 @@ void gfxColorCombineExt(gfxCCUColor_t a, gfxCombineMode_t a_mode, gfxCCUColor_t need_to_compile = 1; } -void gfxAlphaCombineExt(gfxACUColor_t a, gfxCombineMode_t a_mode, gfxACUColor_t b, gfxCombineMode_t b_mode, gfxACUColor_t c, FxBool c_invert, gfxACUColor_t d, FxBool d_invert, FxU32 shift, FxBool invert) +void gfxAlphaCombineExt(gfxACUColor_t a, gfxCombineMode_t a_mode, gfxACUColor_t b, gfxCombineMode_t b_mode, gfxACUColor_t c, FxBool c_invert, gfxACUColor_t d, FxBool d_invert, uint32_t shift, FxBool invert) { WriteTrace(TraceGlitch, TraceDebug, "a: %d a_mode: %d b: %d b_mode: %d c: %d c_invert: %d d: %d d_invert: %d shift: %d invert: %d", a, a_mode, b, b_mode, c, c_invert, d, d_invert, shift, invert); if (invert) WriteTrace(TraceGlitch, TraceWarning, "gfxAlphaCombineExt : inverted result"); @@ -2014,7 +2014,7 @@ void gfxAlphaCombineExt(gfxACUColor_t a, gfxCombineMode_t a_mode, gfxACUColor_t need_to_compile = 1; } -void gfxTexColorCombineExt(GrChipID_t tmu, gfxTCCUColor_t a, gfxCombineMode_t a_mode, gfxTCCUColor_t b, gfxCombineMode_t b_mode, gfxTCCUColor_t c, FxBool c_invert, gfxTCCUColor_t d, FxBool d_invert, FxU32 shift, FxBool invert) +void gfxTexColorCombineExt(GrChipID_t tmu, gfxTCCUColor_t a, gfxCombineMode_t a_mode, gfxTCCUColor_t b, gfxCombineMode_t b_mode, gfxTCCUColor_t c, FxBool c_invert, gfxTCCUColor_t d, FxBool d_invert, uint32_t shift, FxBool invert) { int num_tex; WriteTrace(TraceGlitch, TraceDebug, "tmu: %d a: %d a_mode: %d b: %d b_mode: %d c: %d c_invert: %d d: %d d_invert: %d shift: %d invert: %d", tmu, a, a_mode, b, b_mode, c, c_invert, d, d_invert, shift, invert); @@ -2373,7 +2373,7 @@ void gfxTexColorCombineExt(GrChipID_t tmu, gfxTCCUColor_t a, gfxCombineMode_t a_ need_to_compile = 1; } -void gfxTexAlphaCombineExt(GrChipID_t tmu, gfxTACUColor_t a, gfxCombineMode_t a_mode, gfxTACUColor_t b, gfxCombineMode_t b_mode, gfxTACUColor_t c, FxBool c_invert, gfxTACUColor_t d, FxBool d_invert, FxU32 shift, FxBool invert) +void gfxTexAlphaCombineExt(GrChipID_t tmu, gfxTACUColor_t a, gfxCombineMode_t a_mode, gfxTACUColor_t b, gfxCombineMode_t b_mode, gfxTACUColor_t c, FxBool c_invert, gfxTACUColor_t d, FxBool d_invert, uint32_t shift, FxBool invert) { int num_tex; WriteTrace(TraceGlitch, TraceDebug, "tmu: %d a: %d a_mode: %d b: %d b_mode: %d c: %d c_invert: %d d: %d d_invert: %d shift, invert: %d", tmu, a, a_mode, b, b_mode, c, c_invert, d, d_invert, shift, invert); diff --git a/Source/Project64-video/Renderer/OGLgeometry.cpp b/Source/Project64-video/Renderer/OGLgeometry.cpp index 8807361c2..7b8225094 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(FxU32 param, FxI32 offset, FxU32 mode) +void gfxVertexLayout(uint32_t param, FxI32 offset, uint32_t mode) { WriteTrace(TraceGlitch, TraceDebug, "param: %d offset: %d mode: %d", param, offset, mode); switch (param) @@ -534,7 +534,7 @@ void gfxDrawLine(const void *a, const void *b) grDisplayGLError("gfxDrawLine"); } -void gfxDrawVertexArray(FxU32 mode, FxU32 Count, void *pointers2) +void gfxDrawVertexArray(uint32_t mode, uint32_t Count, void *pointers2) { unsigned int i; float *x, *y, *q, *s0, *t0, *s1, *t1, *z, *fog; @@ -606,7 +606,7 @@ void gfxDrawVertexArray(FxU32 mode, FxU32 Count, void *pointers2) grDisplayGLError("gfxDrawVertexArray"); } -void gfxDrawVertexArrayContiguous(FxU32 mode, FxU32 Count, void *pointers, FxU32 stride) +void gfxDrawVertexArrayContiguous(uint32_t mode, uint32_t Count, void *pointers, uint32_t stride) { unsigned int i; float *x, *y, *q, *s0, *t0, *s1, *t1, *z, *fog; diff --git a/Source/Project64-video/Renderer/OGLglitchmain.cpp b/Source/Project64-video/Renderer/OGLglitchmain.cpp index 607c80ca7..494deb29b 100644 --- a/Source/Project64-video/Renderer/OGLglitchmain.cpp +++ b/Source/Project64-video/Renderer/OGLglitchmain.cpp @@ -320,7 +320,7 @@ struct TMU_USAGE { unsigned long min, max; } tmu_usage[2] = { }; struct texbuf_t { - FxU32 start, end; + uint32_t start, end; int fmt; }; #define NB_TEXBUFS 128 // MUST be a power of two @@ -332,7 +332,7 @@ unsigned short depthBuffer[2048 * 2048]; //#define VOODOO1 -void gfxClipWindow(FxU32 minx, FxU32 miny, FxU32 maxx, FxU32 maxy) +void gfxClipWindow(uint32_t minx, uint32_t miny, uint32_t maxx, uint32_t maxy) { WriteTrace(TraceGlitch, TraceDebug, "minx = %d, miny: %d maxy: %d", minx, miny, maxy); @@ -354,7 +354,7 @@ void gfxClipWindow(FxU32 minx, FxU32 miny, FxU32 maxx, FxU32 maxy) th = screen_height; maxy = th - maxy; miny = th - miny; - FxU32 tmp = maxy; maxy = miny; miny = tmp; + 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 (int(minx) < 0) minx = 0; @@ -446,7 +446,7 @@ int isWglExtensionSupported(const char *extension) #ifdef _WIN32 # include # ifndef ATTACH_PARENT_PROCESS -# define ATTACH_PARENT_PROCESS ((FxU32)-1) +# define ATTACH_PARENT_PROCESS ((uint32_t)-1) # endif extern HWND g_hwnd_win; #endif @@ -863,7 +863,7 @@ FxBool gfxSstWinClose(GrContext_t context) return FXTRUE; } -void gfxTextureBufferExt(GrChipID_t tmu, FxU32 startAddress, GrLOD_t lodmin, GrLOD_t lodmax, GrAspectRatio_t aspect, GrTextureFormat_t fmt, FxU32 evenOdd) +void gfxTextureBufferExt(GrChipID_t tmu, uint32_t startAddress, GrLOD_t lodmin, GrLOD_t lodmax, GrAspectRatio_t aspect, GrTextureFormat_t fmt, uint32_t evenOdd) { int i; static int fbs_init = 0; @@ -1093,7 +1093,7 @@ void gfxTextureBufferExt(GrChipID_t tmu, FxU32 startAddress, GrLOD_t lodmin, GrL } } -int CheckTextureBufferFormat(GrChipID_t tmu, FxU32 startAddress, GrTexInfo *info) +int CheckTextureBufferFormat(GrChipID_t tmu, uint32_t startAddress, GrTexInfo *info) { int found, i; if (!use_fbo) { @@ -1179,7 +1179,7 @@ int CheckTextureBufferFormat(GrChipID_t tmu, FxU32 startAddress, GrTexInfo *info return 0; } -FxU32 gfxGet(FxU32 pname, FxU32 plength, FxI32 *params) +uint32_t gfxGet(uint32_t pname, uint32_t plength, FxI32 *params) { WriteTrace(TraceGlitch, TraceDebug, "pname: %d plength: %d", pname, plength); switch (pname) @@ -1598,7 +1598,7 @@ void gfxAuxBufferExt(GrBuffer_t buffer) grDisplayGLError("gfxAuxBufferExt"); } -void gfxBufferClear(GrColor_t color, gfxAlpha_t alpha, FxU32 depth) +void gfxBufferClear(GrColor_t color, gfxAlpha_t alpha, uint32_t depth) { WriteTrace(TraceGlitch, TraceDebug, "color: %X alpha: %X depth: %X", color, alpha, depth); switch (lfb_color_fmt) @@ -1631,7 +1631,7 @@ void gfxBufferClear(GrColor_t color, gfxAlpha_t alpha, FxU32 depth) grDisplayGLError("gfxBufferClear"); } -void gfxBufferSwap(FxU32 swap_interval) +void gfxBufferSwap(uint32_t swap_interval) { int i; WriteTrace(TraceGlitch, TraceDebug, "swap_interval: %d", swap_interval); @@ -1732,7 +1732,7 @@ FxBool gfxLfbUnlock(GrLock_t type, GrBuffer_t buffer) return FXTRUE; } -FxBool gfxLfbReadRegion(GrBuffer_t src_buffer, FxU32 src_x, FxU32 src_y, FxU32 src_width, FxU32 src_height, FxU32 dst_stride, void *dst_data) +FxBool gfxLfbReadRegion(GrBuffer_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) { unsigned char *buf; unsigned int i, j; @@ -1794,7 +1794,7 @@ FxBool gfxLfbReadRegion(GrBuffer_t src_buffer, FxU32 src_x, FxU32 src_y, FxU32 s return FXTRUE; } -FxBool gfxLfbWriteRegion(GrBuffer_t dst_buffer, FxU32 dst_x, FxU32 dst_y, GrLfbSrcFmt_t src_format, FxU32 src_width, FxU32 src_height, FxBool pixelPipeline, FxI32 src_stride, void *src_data) +FxBool gfxLfbWriteRegion(GrBuffer_t dst_buffer, uint32_t dst_x, uint32_t dst_y, GrLfbSrcFmt_t src_format, uint32_t src_width, uint32_t src_height, FxBool pixelPipeline, FxI32 src_stride, void *src_data) { unsigned char *buf; unsigned int i, j; @@ -1945,7 +1945,7 @@ static void CorrectGamma(const FxU16 aGammaRamp[3][256]) } #endif -void gfxLoadGammaTable(FxU32 /*nentries*/, FxU32 *red, FxU32 *green, FxU32 *blue) +void gfxLoadGammaTable(uint32_t /*nentries*/, uint32_t *red, uint32_t *green, uint32_t *blue) { WriteTrace(TraceGlitch, TraceDebug, "-"); FxU16 aGammaRamp[3][256]; @@ -1958,7 +1958,7 @@ void gfxLoadGammaTable(FxU32 /*nentries*/, FxU32 *red, FxU32 *green, FxU32 *blue CorrectGamma(aGammaRamp); } -void gfxGetGammaTableExt(FxU32 /*nentries*/, FxU32 *red, FxU32 *green, FxU32 *blue) +void gfxGetGammaTableExt(uint32_t /*nentries*/, uint32_t *red, uint32_t *green, uint32_t *blue) { WriteTrace(TraceGlitch, TraceDebug, "-"); FxU16 aGammaRamp[3][256]; diff --git a/Source/Project64-video/Renderer/OGLtextures.cpp b/Source/Project64-video/Renderer/OGLtextures.cpp index da45fed8f..25f9087e1 100644 --- a/Source/Project64-video/Renderer/OGLtextures.cpp +++ b/Source/Project64-video/Renderer/OGLtextures.cpp @@ -139,19 +139,19 @@ void free_textures() } } -FxU32 gfxTexMinAddress(GrChipID_t tmu) +uint32_t gfxTexMinAddress(GrChipID_t tmu) { WriteTrace(TraceGlitch, TraceDebug, "tmu = %d", tmu); return 0; } -FxU32 gfxTexMaxAddress(GrChipID_t tmu) +uint32_t gfxTexMaxAddress(GrChipID_t tmu) { WriteTrace(TraceGlitch, TraceDebug, "tmu = %d", tmu); return TMU_SIZE * 2 - 1; } -FxU32 gfxTexTextureMemRequired(FxU32 evenOdd, GrTexInfo *info) +uint32_t gfxTexTextureMemRequired(uint32_t evenOdd, GrTexInfo *info) { WriteTrace(TraceGlitch, TraceDebug, "evenOdd = %d", evenOdd); int width, height; @@ -198,7 +198,7 @@ FxU32 gfxTexTextureMemRequired(FxU32 evenOdd, GrTexInfo *info) return 0; } -FxU32 gfxTexCalcMemRequired(GrLOD_t lodmin, GrLOD_t lodmax, GrAspectRatio_t aspect, GrTextureFormat_t fmt) +uint32_t gfxTexCalcMemRequired(GrLOD_t lodmin, GrLOD_t lodmax, GrAspectRatio_t aspect, GrTextureFormat_t fmt) { WriteTrace(TraceGlitch, TraceDebug, "lodmin = %d, lodmax: %d aspect: %d fmt: %d", lodmin, lodmax, aspect, fmt); int width, height; @@ -370,7 +370,7 @@ int grTexFormat2GLPackedFmt(int fmt, int * gltexfmt, int * glpixfmt, int * glpac return factor; } -void gfxTexDownloadMipMap(GrChipID_t tmu, FxU32 startAddress, FxU32 evenOdd, GrTexInfo *info) +void gfxTexDownloadMipMap(GrChipID_t tmu, uint32_t startAddress, uint32_t evenOdd, GrTexInfo *info) { WriteTrace(TraceGlitch, TraceDebug, "tmu = %d, startAddress: %d evenOdd: %d", tmu, startAddress, evenOdd); @@ -478,7 +478,7 @@ void gfxTexDownloadMipMap(GrChipID_t tmu, FxU32 startAddress, FxU32 evenOdd, GrT m++; n++; } - } + } factor = 2; glformat = GL_RGB; break; @@ -501,7 +501,7 @@ void gfxTexDownloadMipMap(GrChipID_t tmu, FxU32 startAddress, FxU32 evenOdd, GrT m++; n++; } - } + } factor = 2; glformat = GL_RGB5_A1; break; @@ -540,7 +540,7 @@ void gfxTexDownloadMipMap(GrChipID_t tmu, FxU32 startAddress, FxU32 evenOdd, GrT m++; n++; } - } + } factor = 2; glformat = GL_RGBA4; break; @@ -581,8 +581,8 @@ void gfxTexDownloadMipMap(GrChipID_t tmu, FxU32 startAddress, FxU32 evenOdd, GrT default: WriteTrace(TraceGlitch, TraceWarning, "gfxTexDownloadMipMap : unknown texture format: %x", info->format); factor = 0; - } - } + } + } if (nbTextureUnits <= 2) glActiveTextureARB(GL_TEXTURE1_ARB); @@ -625,11 +625,11 @@ void gfxTexDownloadMipMap(GrChipID_t tmu, FxU32 startAddress, FxU32 evenOdd, GrT glBindTexture(GL_TEXTURE_2D, default_texture); grDisplayGLError("gfxTexDownloadMipMap"); - } +} -int CheckTextureBufferFormat(GrChipID_t tmu, FxU32 startAddress, GrTexInfo *info); +int CheckTextureBufferFormat(GrChipID_t tmu, uint32_t startAddress, GrTexInfo *info); -void gfxTexSource(GrChipID_t tmu, FxU32 startAddress, FxU32 evenOdd, GrTexInfo *info) +void gfxTexSource(GrChipID_t tmu, uint32_t startAddress, uint32_t evenOdd, GrTexInfo *info) { WriteTrace(TraceGlitch, TraceDebug, "tmu = %d, startAddress: %d evenOdd: %d", tmu, startAddress, evenOdd); diff --git a/Source/Project64-video/Renderer/Renderer.h b/Source/Project64-video/Renderer/Renderer.h index 6766f94ab..96df3bf00 100644 --- a/Source/Project64-video/Renderer/Renderer.h +++ b/Source/Project64-video/Renderer/Renderer.h @@ -15,13 +15,13 @@ #include #include -void gfxClipWindow(FxU32 minx, FxU32 miny, FxU32 maxx, FxU32 maxy); +void gfxClipWindow(uint32_t minx, uint32_t miny, uint32_t maxx, uint32_t maxy); void gfxColorMask(FxBool rgb, FxBool a); -FxU32 gfxTexMinAddress(GrChipID_t tmu); +uint32_t gfxTexMinAddress(GrChipID_t tmu); FxBool gfxSstWinClose(GrContext_t context); -void gfxTextureBufferExt(GrChipID_t tmu, FxU32 startAddress, GrLOD_t lodmin, GrLOD_t lodmax, GrAspectRatio_t aspect, GrTextureFormat_t fmt, FxU32 evenOdd); -FxU32 gfxTexMaxAddress(GrChipID_t tmu); -FxU32 gfxTexTextureMemRequired(FxU32 evenOdd, GrTexInfo *info); +void gfxTextureBufferExt(GrChipID_t tmu, uint32_t startAddress, GrLOD_t lodmin, GrLOD_t lodmax, GrAspectRatio_t aspect, GrTextureFormat_t fmt, uint32_t evenOdd); +uint32_t gfxTexMaxAddress(GrChipID_t tmu); +uint32_t gfxTexTextureMemRequired(uint32_t evenOdd, GrTexInfo *info); void gfxConstantColorValue(GrColor_t value); void gfxColorCombine(GrCombineFunction_t function, GrCombineFactor_t factor, GrCombineLocal_t local, GrCombineOther_t other, FxBool invert); void gfxAlphaCombine(GrCombineFunction_t function, GrCombineFactor_t factor, GrCombineLocal_t local, GrCombineOther_t other, FxBool invert); @@ -35,12 +35,12 @@ void gfxFogColorValue(GrColor_t fogcolor); void gfxChromakeyMode(GrChromakeyMode_t mode); void gfxChromakeyValue(GrColor_t value); void gfxStippleMode(GrStippleMode_t mode); -void gfxColorCombineExt(gfxCCUColor_t a, gfxCombineMode_t a_mode, gfxCCUColor_t b, gfxCombineMode_t b_mode, gfxCCUColor_t c, FxBool c_invert, gfxCCUColor_t d, FxBool d_invert, FxU32 shift, FxBool invert); -void gfxAlphaCombineExt(gfxACUColor_t a, gfxCombineMode_t a_mode, gfxACUColor_t b, gfxCombineMode_t b_mode, gfxACUColor_t c, FxBool c_invert, gfxACUColor_t d, FxBool d_invert, FxU32 shift, FxBool invert); -void gfxTexColorCombineExt(GrChipID_t tmu, gfxTCCUColor_t a, gfxCombineMode_t a_mode, gfxTCCUColor_t b, gfxCombineMode_t b_mode, gfxTCCUColor_t c, FxBool c_invert, gfxTCCUColor_t d, FxBool d_invert, FxU32 shift, FxBool invert); -void gfxTexAlphaCombineExt(GrChipID_t tmu, gfxTACUColor_t a, gfxCombineMode_t a_mode, gfxTACUColor_t b, gfxCombineMode_t b_mode, gfxTACUColor_t c, FxBool c_invert, gfxTACUColor_t d, FxBool d_invert, FxU32 shift, FxBool invert); +void gfxColorCombineExt(gfxCCUColor_t a, gfxCombineMode_t a_mode, gfxCCUColor_t b, gfxCombineMode_t b_mode, gfxCCUColor_t c, FxBool c_invert, gfxCCUColor_t d, FxBool d_invert, uint32_t shift, FxBool invert); +void gfxAlphaCombineExt(gfxACUColor_t a, gfxCombineMode_t a_mode, gfxACUColor_t b, gfxCombineMode_t b_mode, gfxACUColor_t c, FxBool c_invert, gfxACUColor_t d, FxBool d_invert, uint32_t shift, FxBool invert); +void gfxTexColorCombineExt(GrChipID_t tmu, gfxTCCUColor_t a, gfxCombineMode_t a_mode, gfxTCCUColor_t b, gfxCombineMode_t b_mode, gfxTCCUColor_t c, FxBool c_invert, gfxTCCUColor_t d, FxBool d_invert, uint32_t shift, FxBool invert); +void gfxTexAlphaCombineExt(GrChipID_t tmu, gfxTACUColor_t a, gfxCombineMode_t a_mode, gfxTACUColor_t b, gfxCombineMode_t b_mode, gfxTACUColor_t c, FxBool c_invert, gfxTACUColor_t d, FxBool d_invert, uint32_t shift, FxBool invert); void gfxConstantColorValueExt(GrChipID_t tmu, GrColor_t value); -void gfxVertexLayout(FxU32 param, FxI32 offset, FxU32 mode); +void gfxVertexLayout(uint32_t param, FxI32 offset, uint32_t mode); void gfxCullMode(GrCullMode_t mode); void gfxDepthBufferMode(GrDepthBufferMode_t mode); void gfxDepthBufferFunction(GrCmpFnc_t function); @@ -48,26 +48,26 @@ void gfxDepthMask(FxBool mask); void gfxDrawTriangle(const void *a, const void *b, const void *c); void gfxDepthBiasLevel(FxI32 level); void gfxDrawLine(const void *a, const void *b); -void gfxDrawVertexArray(FxU32 mode, FxU32 Count, void *pointers2); -void gfxDrawVertexArrayContiguous(FxU32 mode, FxU32 Count, void *pointers, FxU32 stride); +void gfxDrawVertexArray(uint32_t mode, uint32_t Count, void *pointers2); +void gfxDrawVertexArrayContiguous(uint32_t mode, uint32_t Count, void *pointers, uint32_t stride); GrContext_t gfxSstWinOpen(GrColorFormat_t color_format, GrOriginLocation_t origin_location, int nColBuffers, int nAuxBuffers); void gfxAuxBufferExt(GrBuffer_t buffer); -FxU32 gfxGet(FxU32 pname, FxU32 plength, FxI32 *params); +uint32_t gfxGet(uint32_t pname, uint32_t plength, FxI32 *params); void gfxFramebufferCopyExt(int x, int y, int w, int h, int from, int to, int mode); void gfxRenderBuffer(GrBuffer_t buffer); -void gfxBufferClear(GrColor_t color, gfxAlpha_t alpha, FxU32 depth); -void gfxBufferSwap(FxU32 swap_interval); +void gfxBufferClear(GrColor_t color, gfxAlpha_t alpha, uint32_t depth); +void gfxBufferSwap(uint32_t swap_interval); FxBool gfxLfbLock(GrLock_t type, GrBuffer_t buffer, GrLfbWriteMode_t writeMode, GrOriginLocation_t origin, FxBool pixelPipeline, GrLfbInfo_t *info); FxBool gfxLfbUnlock(GrLock_t type, GrBuffer_t buffer); -FxBool gfxLfbReadRegion(GrBuffer_t src_buffer, FxU32 src_x, FxU32 src_y, FxU32 src_width, FxU32 src_height, FxU32 dst_stride, void *dst_data); -FxBool gfxLfbWriteRegion(GrBuffer_t dst_buffer, FxU32 dst_x, FxU32 dst_y, GrLfbSrcFmt_t src_format, FxU32 src_width, FxU32 src_height, FxBool pixelPipeline, FxI32 src_stride, void *src_data); -FxU32 gfxTexCalcMemRequired(GrLOD_t lodmin, GrLOD_t lodmax, GrAspectRatio_t aspect, GrTextureFormat_t fmt); -void gfxLoadGammaTable(FxU32 nentries, FxU32 *red, FxU32 *green, FxU32 *blue); -void gfxGetGammaTableExt(FxU32 /*nentries*/, FxU32 *red, FxU32 *green, FxU32 *blue); +FxBool gfxLfbReadRegion(GrBuffer_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); +FxBool gfxLfbWriteRegion(GrBuffer_t dst_buffer, uint32_t dst_x, uint32_t dst_y, GrLfbSrcFmt_t src_format, uint32_t src_width, uint32_t src_height, FxBool pixelPipeline, FxI32 src_stride, void *src_data); +uint32_t gfxTexCalcMemRequired(GrLOD_t lodmin, GrLOD_t lodmax, GrAspectRatio_t aspect, GrTextureFormat_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); void gfxGammaCorrectionRGB(FxFloat gammaR, FxFloat gammaG, FxFloat gammaB); -void gfxTexDownloadMipMap(GrChipID_t tmu, FxU32 startAddress, FxU32 evenOdd, GrTexInfo *info); -void gfxTexSource(GrChipID_t tmu, FxU32 startAddress, FxU32 evenOdd, GrTexInfo *info); +void gfxTexDownloadMipMap(GrChipID_t tmu, uint32_t startAddress, uint32_t evenOdd, GrTexInfo *info); +void gfxTexSource(GrChipID_t tmu, uint32_t startAddress, uint32_t evenOdd, GrTexInfo *info); void gfxTexDetailControl(GrChipID_t tmu, int lod_bias, FxU8 detail_scale, float detail_max); void gfxTexClampMode(GrChipID_t tmu, GrTextureClampMode_t s_clampmode, GrTextureClampMode_t t_clampmode); void gfxTexFilterMode(GrChipID_t tmu, GrTextureFilterMode_t minfilter_mode, GrTextureFilterMode_t magfilter_mode); diff --git a/Source/Project64-video/rdp.h b/Source/Project64-video/rdp.h index 3fb3579dc..7a811eaad 100644 --- a/Source/Project64-video/rdp.h +++ b/Source/Project64-video/rdp.h @@ -160,9 +160,9 @@ typedef struct int has_2mb_tex_boundary; int gamma_correction; FxI32 gamma_table_size; - FxU32 *gamma_table_r; - FxU32 *gamma_table_g; - FxU32 *gamma_table_b; + uint32_t *gamma_table_r; + uint32_t *gamma_table_g; + uint32_t *gamma_table_b; uint32_t tmem_ptr[MAX_TMU]; uint32_t tex_min_addr[MAX_TMU]; uint32_t tex_max_addr[MAX_TMU];