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

[Video] Rename grChromakeyValue to gfxChromakeyValue

This commit is contained in:
zilmar 2017-05-24 18:01:36 +10:00
parent 2a76869509
commit 1a43514df1
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15667,7 +15667,7 @@ void Combine()
; ;
else else
{ {
grChromakeyValue(0); gfxChromakeyValue(0);
gfxChromakeyMode(GR_CHROMAKEY_ENABLE); gfxChromakeyMode(GR_CHROMAKEY_ENABLE);
} }
} }

5
Source/Project64-video/Renderer/OGLEScombiner.cpp
View File

@ -1639,8 +1639,7 @@ void gfxChromakeyMode(GrChromakeyMode_t mode)
need_to_compile = 1; need_to_compile = 1;
} }
FX_ENTRY void FX_CALL void gfxChromakeyValue(GrColor_t value)
grChromakeyValue(GrColor_t value)
{ {
WriteTrace(TraceGlitch, TraceDebug, "value: %d", value); WriteTrace(TraceGlitch, TraceDebug, "value: %d", value);
int chroma_color_location; int chroma_color_location;
@ -1660,7 +1659,7 @@ grChromakeyValue(GrColor_t value)
g_chroma_color[3] = 1.0;//(value & 0xFF) / 255.0f; g_chroma_color[3] = 1.0;//(value & 0xFF) / 255.0f;
break; break;
default: 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(); vbo_draw();
chroma_color_location = glGetUniformLocation(g_program_object_default, "chroma_color"); chroma_color_location = glGetUniformLocation(g_program_object_default, "chroma_color");

7
Source/Project64-video/Renderer/OGLcombiner.cpp
View File

@ -1592,8 +1592,7 @@ void gfxChromakeyMode(GrChromakeyMode_t mode)
need_to_compile = 1; need_to_compile = 1;
} }
FX_ENTRY void FX_CALL void gfxChromakeyValue(GrColor_t value)
grChromakeyValue(GrColor_t value)
{ {
WriteTrace(TraceGlitch, TraceDebug, "value: %d", value); WriteTrace(TraceGlitch, TraceDebug, "value: %d", value);
int chroma_color_location; int chroma_color_location;
@ -1613,13 +1612,13 @@ grChromakeyValue(GrColor_t value)
chroma_color[3] = 1.0;//(value & 0xFF) / 255.0f; chroma_color[3] = 1.0;//(value & 0xFF) / 255.0f;
break; break;
default: 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"); chroma_color_location = glGetUniformLocationARB(program_object, "chroma_color");
glUniform4fARB(chroma_color_location, chroma_color[0], chroma_color[1], glUniform4fARB(chroma_color_location, chroma_color[0], chroma_color[1],
chroma_color[2], chroma_color[3]); chroma_color[2], chroma_color[3]);
grDisplayGLError("grChromakeyValue"); grDisplayGLError("gfxChromakeyValue");
} }
void setPattern() void setPattern()

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

@ -34,6 +34,7 @@ void gfxFogMode(GrFogMode_t mode);
void gfxFogGenerateLinear(float nearZ, float farZ); void gfxFogGenerateLinear(float nearZ, float farZ);
void gfxFogColorValue(GrColor_t fogcolor); void gfxFogColorValue(GrColor_t fogcolor);
void gfxChromakeyMode(GrChromakeyMode_t mode); void gfxChromakeyMode(GrChromakeyMode_t mode);
void gfxChromakeyValue(GrColor_t value);
extern uint32_t nbTextureUnits; extern uint32_t nbTextureUnits;
extern uint32_t g_scr_res_x, g_scr_res_y, g_res_x, g_res_y; extern uint32_t g_scr_res_x, g_scr_res_y, g_res_x, g_res_y;