diff --git a/Source/Project64-video/Renderer/OGLEScombiner.cpp b/Source/Project64-video/Renderer/OGLEScombiner.cpp index 3f2eca41e..39416eac6 100644 --- a/Source/Project64-video/Renderer/OGLEScombiner.cpp +++ b/Source/Project64-video/Renderer/OGLEScombiner.cpp @@ -676,7 +676,7 @@ void set_lambda() glUniform1f(lambda_location, lambda); } -void gfxConstantColorValue(GrColor_t value) +void gfxConstantColorValue(gfxColor_t value) { WriteTrace(TraceGlitch, TraceDebug, "value: %d", value); switch (lfb_color_fmt) @@ -1598,7 +1598,7 @@ void gfxFogGenerateLinear(float nearZ, float farZ) fogEnd = farZ / 255.0f; } -void gfxFogColorValue(GrColor_t fogcolor) +void gfxFogColorValue(gfxColor_t fogcolor) { WriteTrace(TraceGlitch, TraceDebug, "fogcolor: %x", fogcolor); @@ -1639,7 +1639,7 @@ void gfxChromakeyMode(GrChromakeyMode_t mode) need_to_compile = 1; } -void gfxChromakeyValue(GrColor_t value) +void gfxChromakeyValue(gfxColor_t value) { WriteTrace(TraceGlitch, TraceDebug, "value: %d", value); int chroma_color_location; @@ -2688,7 +2688,7 @@ void gfxTexAlphaCombineExt(gfxChipID_t tmu, gfxTACUColor_t a, gfxCombineMode_t a need_to_compile = 1; } -void gfxConstantColorValueExt(gfxChipID_t tmu, GrColor_t value) +void gfxConstantColorValueExt(gfxChipID_t tmu, gfxColor_t value) { int num_tex; WriteTrace(TraceGlitch, TraceDebug, "tmu: %d value: %d", tmu, value); diff --git a/Source/Project64-video/Renderer/OGLESglitchmain.cpp b/Source/Project64-video/Renderer/OGLESglitchmain.cpp index 6604950d6..0524aa53d 100644 --- a/Source/Project64-video/Renderer/OGLESglitchmain.cpp +++ b/Source/Project64-video/Renderer/OGLESglitchmain.cpp @@ -1304,7 +1304,7 @@ void gfxAuxBufferExt(GrBuffer_t buffer) } } -void gfxBufferClear(GrColor_t color, gfxAlpha_t alpha, uint32_t depth) +void gfxBufferClear(gfxColor_t color, gfxAlpha_t alpha, uint32_t depth) { WriteTrace(TraceGlitch, TraceDebug, "color: %d alpha: %d depth: %d", color, alpha, depth); vbo_draw(); diff --git a/Source/Project64-video/Renderer/OGLcombiner.cpp b/Source/Project64-video/Renderer/OGLcombiner.cpp index 36e28f9dc..19dbc315b 100644 --- a/Source/Project64-video/Renderer/OGLcombiner.cpp +++ b/Source/Project64-video/Renderer/OGLcombiner.cpp @@ -578,7 +578,7 @@ void set_lambda() grDisplayGLError("set_lambda"); } -void gfxConstantColorValue(GrColor_t value) +void gfxConstantColorValue(gfxColor_t value) { WriteTrace(TraceGlitch, TraceDebug, "value: %d", value); switch (lfb_color_fmt) @@ -1547,7 +1547,7 @@ void gfxFogGenerateLinear(float nearZ, float farZ) grDisplayGLError("gfxFogGenerateLinear"); } -void gfxFogColorValue(GrColor_t fogcolor) +void gfxFogColorValue(gfxColor_t fogcolor) { float color[4]; WriteTrace(TraceGlitch, TraceDebug, "fogcolor: %x", fogcolor); @@ -1592,7 +1592,7 @@ void gfxChromakeyMode(GrChromakeyMode_t mode) need_to_compile = 1; } -void gfxChromakeyValue(GrColor_t value) +void gfxChromakeyValue(gfxColor_t value) { WriteTrace(TraceGlitch, TraceDebug, "value: %d", value); int chroma_color_location; @@ -2651,7 +2651,7 @@ void gfxTexAlphaCombineExt(gfxChipID_t tmu, gfxTACUColor_t a, gfxCombineMode_t a need_to_compile = 1; } -void gfxConstantColorValueExt(gfxChipID_t tmu, GrColor_t value) +void gfxConstantColorValueExt(gfxChipID_t tmu, gfxColor_t value) { int num_tex; WriteTrace(TraceGlitch, TraceDebug, "tmu: %d value: %d", tmu, value); diff --git a/Source/Project64-video/Renderer/OGLglitchmain.cpp b/Source/Project64-video/Renderer/OGLglitchmain.cpp index 53d5163ff..cfb0eb90f 100644 --- a/Source/Project64-video/Renderer/OGLglitchmain.cpp +++ b/Source/Project64-video/Renderer/OGLglitchmain.cpp @@ -1598,7 +1598,7 @@ void gfxAuxBufferExt(GrBuffer_t buffer) grDisplayGLError("gfxAuxBufferExt"); } -void gfxBufferClear(GrColor_t color, gfxAlpha_t alpha, uint32_t depth) +void gfxBufferClear(gfxColor_t color, gfxAlpha_t alpha, uint32_t depth) { WriteTrace(TraceGlitch, TraceDebug, "color: %X alpha: %X depth: %X", color, alpha, depth); switch (lfb_color_fmt) diff --git a/Source/Project64-video/Renderer/Renderer.h b/Source/Project64-video/Renderer/Renderer.h index 7784bf697..36d02dd5e 100644 --- a/Source/Project64-video/Renderer/Renderer.h +++ b/Source/Project64-video/Renderer/Renderer.h @@ -22,7 +22,7 @@ bool gfxSstWinClose(); void gfxTextureBufferExt(gfxChipID_t tmu, uint32_t startAddress, gfxLOD_t lodmin, gfxLOD_t lodmax, gfxAspectRatio_t aspect, gfxTextureFormat_t fmt, uint32_t evenOdd); uint32_t gfxTexMaxAddress(gfxChipID_t tmu); uint32_t gfxTexTextureMemRequired(uint32_t evenOdd, gfxTexInfo *info); -void gfxConstantColorValue(GrColor_t value); +void gfxConstantColorValue(gfxColor_t value); void gfxColorCombine(GrCombineFunction_t function, GrCombineFactor_t factor, GrCombineLocal_t local, GrCombineOther_t other, bool invert); void gfxAlphaCombine(GrCombineFunction_t function, GrCombineFactor_t factor, GrCombineLocal_t local, GrCombineOther_t other, bool invert); void gfxTexCombine(gfxChipID_t tmu, GrCombineFunction_t rgb_function, GrCombineFactor_t rgb_factor, GrCombineFunction_t alpha_function, GrCombineFactor_t alpha_factor, bool rgb_invert, bool alpha_invert); @@ -31,15 +31,15 @@ void gfxAlphaTestReferenceValue(gfxAlpha_t value); void gfxAlphaTestFunction(GrCmpFnc_t function); void gfxFogMode(GrFogMode_t mode); void gfxFogGenerateLinear(float nearZ, float farZ); -void gfxFogColorValue(GrColor_t fogcolor); +void gfxFogColorValue(gfxColor_t fogcolor); void gfxChromakeyMode(GrChromakeyMode_t mode); -void gfxChromakeyValue(GrColor_t value); +void gfxChromakeyValue(gfxColor_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, bool c_invert, gfxCCUColor_t d, bool d_invert, uint32_t shift, bool invert); void gfxAlphaCombineExt(gfxACUColor_t a, gfxCombineMode_t a_mode, gfxACUColor_t b, gfxCombineMode_t b_mode, gfxACUColor_t c, bool c_invert, gfxACUColor_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 gfxConstantColorValueExt(gfxChipID_t tmu, GrColor_t value); +void gfxConstantColorValueExt(gfxChipID_t tmu, gfxColor_t value); void gfxVertexLayout(uint32_t param, FxI32 offset, uint32_t mode); void gfxCullMode(GrCullMode_t mode); void gfxDepthBufferMode(GrDepthBufferMode_t mode); @@ -56,7 +56,7 @@ void gfxAuxBufferExt(GrBuffer_t buffer); 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, uint32_t depth); +void gfxBufferClear(gfxColor_t color, gfxAlpha_t alpha, uint32_t depth); void gfxBufferSwap(uint32_t swap_interval); bool gfxLfbLock(GrLock_t type, GrBuffer_t buffer, GrLfbWriteMode_t writeMode, GrOriginLocation_t origin, bool pixelPipeline, GrLfbInfo_t *info); bool gfxLfbUnlock(GrLock_t type, GrBuffer_t buffer); diff --git a/Source/Project64-video/Renderer/types.h b/Source/Project64-video/Renderer/types.h index 777e15418..5a6dba28c 100644 --- a/Source/Project64-video/Renderer/types.h +++ b/Source/Project64-video/Renderer/types.h @@ -16,6 +16,7 @@ #include typedef uint8_t gfxAlpha_t; +typedef uint32_t gfxColor_t; typedef uint32_t gfxCCUColor_t; typedef uint32_t gfxACUColor_t; typedef uint32_t gfxTCCUColor_t;