From 1a43514df1dd2451293901ad07f33566e3279609 Mon Sep 17 00:00:00 2001 From: zilmar Date: Wed, 24 May 2017 18:01:36 +1000 Subject: [PATCH] [Video] Rename grChromakeyValue to gfxChromakeyValue --- Source/Project64-video/Combine.cpp | 2 +- Source/Project64-video/Renderer/OGLEScombiner.cpp | 5 ++--- Source/Project64-video/Renderer/OGLcombiner.cpp | 7 +++---- Source/Project64-video/Renderer/Renderer.h | 1 + 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Source/Project64-video/Combine.cpp b/Source/Project64-video/Combine.cpp index afa92a43c..6e435c08d 100644 --- a/Source/Project64-video/Combine.cpp +++ b/Source/Project64-video/Combine.cpp @@ -15667,7 +15667,7 @@ void Combine() ; else { - grChromakeyValue(0); + gfxChromakeyValue(0); gfxChromakeyMode(GR_CHROMAKEY_ENABLE); } } diff --git a/Source/Project64-video/Renderer/OGLEScombiner.cpp b/Source/Project64-video/Renderer/OGLEScombiner.cpp index 19ce19b75..ca3a0f9e2 100644 --- a/Source/Project64-video/Renderer/OGLEScombiner.cpp +++ b/Source/Project64-video/Renderer/OGLEScombiner.cpp @@ -1639,8 +1639,7 @@ void gfxChromakeyMode(GrChromakeyMode_t mode) need_to_compile = 1; } -FX_ENTRY void FX_CALL -grChromakeyValue(GrColor_t value) +void gfxChromakeyValue(GrColor_t value) { WriteTrace(TraceGlitch, TraceDebug, "value: %d", value); int chroma_color_location; @@ -1660,7 +1659,7 @@ grChromakeyValue(GrColor_t value) g_chroma_color[3] = 1.0;//(value & 0xFF) / 255.0f; break; default: - WriteTrace(TraceGlitch, TraceWarning, "grChromakeyValue: unknown color format : %x", lfb_color_fmt); + WriteTrace(TraceGlitch, TraceWarning, "gfxChromakeyValue: unknown color format : %x", lfb_color_fmt); } vbo_draw(); chroma_color_location = glGetUniformLocation(g_program_object_default, "chroma_color"); diff --git a/Source/Project64-video/Renderer/OGLcombiner.cpp b/Source/Project64-video/Renderer/OGLcombiner.cpp index cf5589072..89f738754 100644 --- a/Source/Project64-video/Renderer/OGLcombiner.cpp +++ b/Source/Project64-video/Renderer/OGLcombiner.cpp @@ -1592,8 +1592,7 @@ void gfxChromakeyMode(GrChromakeyMode_t mode) need_to_compile = 1; } -FX_ENTRY void FX_CALL -grChromakeyValue(GrColor_t value) +void gfxChromakeyValue(GrColor_t value) { WriteTrace(TraceGlitch, TraceDebug, "value: %d", value); int chroma_color_location; @@ -1613,13 +1612,13 @@ grChromakeyValue(GrColor_t value) chroma_color[3] = 1.0;//(value & 0xFF) / 255.0f; break; default: - WriteTrace(TraceGlitch, TraceWarning, "grChromakeyValue: unknown color format : %x", lfb_color_fmt); + WriteTrace(TraceGlitch, TraceWarning, "gfxChromakeyValue: unknown color format : %x", lfb_color_fmt); } chroma_color_location = glGetUniformLocationARB(program_object, "chroma_color"); glUniform4fARB(chroma_color_location, chroma_color[0], chroma_color[1], chroma_color[2], chroma_color[3]); - grDisplayGLError("grChromakeyValue"); + grDisplayGLError("gfxChromakeyValue"); } void setPattern() diff --git a/Source/Project64-video/Renderer/Renderer.h b/Source/Project64-video/Renderer/Renderer.h index 7b3785387..59da1b0a7 100644 --- a/Source/Project64-video/Renderer/Renderer.h +++ b/Source/Project64-video/Renderer/Renderer.h @@ -34,6 +34,7 @@ void gfxFogMode(GrFogMode_t mode); void gfxFogGenerateLinear(float nearZ, float farZ); void gfxFogColorValue(GrColor_t fogcolor); void gfxChromakeyMode(GrChromakeyMode_t mode); +void gfxChromakeyValue(GrColor_t value); extern uint32_t nbTextureUnits; extern uint32_t g_scr_res_x, g_scr_res_y, g_res_x, g_res_y;