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

[Video] Rename grVertexLayout to gfxVertexLayout

This commit is contained in:
zilmar 2017-05-25 08:31:05 +10:00
parent d323579940
commit 6f29160453
4 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Project64-video/Main.cpp
View File

@ -522,19 +522,19 @@ int InitGfx()
voodoo.sup_mirroring = 1; voodoo.sup_mirroring = 1;
#endif #endif
grVertexLayout(GR_PARAM_XY, offsetof(VERTEX, x), GR_PARAM_ENABLE); gfxVertexLayout(GR_PARAM_XY, offsetof(VERTEX, x), GR_PARAM_ENABLE);
grVertexLayout(GR_PARAM_Q, offsetof(VERTEX, q), GR_PARAM_ENABLE); gfxVertexLayout(GR_PARAM_Q, offsetof(VERTEX, q), GR_PARAM_ENABLE);
grVertexLayout(GR_PARAM_Z, offsetof(VERTEX, z), GR_PARAM_ENABLE); gfxVertexLayout(GR_PARAM_Z, offsetof(VERTEX, z), GR_PARAM_ENABLE);
grVertexLayout(GR_PARAM_ST0, offsetof(VERTEX, coord[0]), GR_PARAM_ENABLE); gfxVertexLayout(GR_PARAM_ST0, offsetof(VERTEX, coord[0]), GR_PARAM_ENABLE);
grVertexLayout(GR_PARAM_ST1, offsetof(VERTEX, coord[2]), GR_PARAM_ENABLE); gfxVertexLayout(GR_PARAM_ST1, offsetof(VERTEX, coord[2]), GR_PARAM_ENABLE);
grVertexLayout(GR_PARAM_PARGB, offsetof(VERTEX, b), GR_PARAM_ENABLE); gfxVertexLayout(GR_PARAM_PARGB, offsetof(VERTEX, b), GR_PARAM_ENABLE);
grCullMode(GR_CULL_NEGATIVE); grCullMode(GR_CULL_NEGATIVE);
if (g_settings->fog()) //"FOGCOORD" extension if (g_settings->fog()) //"FOGCOORD" extension
{ {
gfxFogGenerateLinear(0.0f, 255.0f); gfxFogGenerateLinear(0.0f, 255.0f);
grVertexLayout(GR_PARAM_FOG_EXT, offsetof(VERTEX, f), GR_PARAM_ENABLE); gfxVertexLayout(GR_PARAM_FOG_EXT, offsetof(VERTEX, f), GR_PARAM_ENABLE);
} }
grDepthBufferMode(GR_DEPTHBUFFER_ZBUFFER); grDepthBufferMode(GR_DEPTHBUFFER_ZBUFFER);

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

@ -143,8 +143,7 @@ void init_geometry()
glDisable(GL_DEPTH_TEST); glDisable(GL_DEPTH_TEST);
} }
FX_ENTRY void FX_CALL void gfxVertexLayout(FxU32 param, FxI32 offset, FxU32 mode)
grVertexLayout(FxU32 param, FxI32 offset, FxU32 mode)
{ {
WriteTrace(TraceGlitch, TraceDebug, "param: %d offset: %d mode: %d", param, offset, mode); WriteTrace(TraceGlitch, TraceDebug, "param: %d offset: %d mode: %d", param, offset, mode);
switch (param) switch (param)
@ -178,7 +177,7 @@ grVertexLayout(FxU32 param, FxI32 offset, FxU32 mode)
st1_off = offset; st1_off = offset;
break; break;
default: default:
WriteTrace(TraceGlitch, TraceWarning, "unknown grVertexLayout parameter : %x", param); WriteTrace(TraceGlitch, TraceWarning, "unknown gfxVertexLayout parameter : %x", param);
} }
} }

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

@ -73,8 +73,7 @@ void init_geometry()
grDisplayGLError("init_geometry"); grDisplayGLError("init_geometry");
} }
FX_ENTRY void FX_CALL void gfxVertexLayout(FxU32 param, FxI32 offset, FxU32 mode)
grVertexLayout(FxU32 param, FxI32 offset, FxU32 mode)
{ {
WriteTrace(TraceGlitch, TraceDebug, "param: %d offset: %d mode: %d", param, offset, mode); WriteTrace(TraceGlitch, TraceDebug, "param: %d offset: %d mode: %d", param, offset, mode);
switch (param) switch (param)
@ -108,7 +107,7 @@ grVertexLayout(FxU32 param, FxI32 offset, FxU32 mode)
st1_off = offset; st1_off = offset;
break; break;
default: default:
WriteTrace(TraceGlitch, TraceWarning, "unknown grVertexLayout parameter : %x", param); WriteTrace(TraceGlitch, TraceWarning, "unknown gfxVertexLayout parameter : %x", param);
} }
} }

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

@ -41,6 +41,7 @@ void gfxAlphaCombineExt(GrACUColor_t a, GrCombineMode_t a_mode, GrACUColor_t b,
void gfxTexColorCombineExt(GrChipID_t tmu, GrTCCUColor_t a, GrCombineMode_t a_mode, GrTCCUColor_t b, GrCombineMode_t b_mode, GrTCCUColor_t c, FxBool c_invert, GrTCCUColor_t d, FxBool d_invert, FxU32 shift, FxBool invert); void gfxTexColorCombineExt(GrChipID_t tmu, GrTCCUColor_t a, GrCombineMode_t a_mode, GrTCCUColor_t b, GrCombineMode_t b_mode, GrTCCUColor_t c, FxBool c_invert, GrTCCUColor_t d, FxBool d_invert, FxU32 shift, FxBool invert);
void gfxTexAlphaCombineExt(GrChipID_t tmu, GrTACUColor_t a, GrCombineMode_t a_mode, GrTACUColor_t b, GrCombineMode_t b_mode, GrTACUColor_t c, FxBool c_invert, GrTACUColor_t d, FxBool d_invert, FxU32 shift, FxBool invert); void gfxTexAlphaCombineExt(GrChipID_t tmu, GrTACUColor_t a, GrCombineMode_t a_mode, GrTACUColor_t b, GrCombineMode_t b_mode, GrTACUColor_t c, FxBool c_invert, GrTACUColor_t d, FxBool d_invert, FxU32 shift, FxBool invert);
void gfxConstantColorValueExt(GrChipID_t tmu, GrColor_t value); void gfxConstantColorValueExt(GrChipID_t tmu, GrColor_t value);
void gfxVertexLayout(FxU32 param, FxI32 offset, FxU32 mode);
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;