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

[Video] Rename grDepthBufferFunction to gfxDepthBufferFunction

This commit is contained in:
zilmar 2017-05-25 08:49:39 +10:00
parent c4dc8f587e
commit 704e132ddc
9 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Project64-video/FBtoScreen.cpp
View File

@ -90,7 +90,7 @@ static int SetupFBtoScreenCombiner(uint32_t texture_size, uint32_t opaque)
GR_BLEND_ONE, GR_BLEND_ONE,
GR_BLEND_ZERO); GR_BLEND_ZERO);
} }
grDepthBufferFunction(GR_CMP_ALWAYS); gfxDepthBufferFunction(GR_CMP_ALWAYS);
gfxCullMode(GR_CULL_DISABLE); gfxCullMode(GR_CULL_DISABLE);
grDepthMask(FXFALSE); grDepthMask(FXFALSE);
rdp.update |= UPDATE_COMBINE | UPDATE_ZBUF_ENABLED | UPDATE_CULL_MODE; rdp.update |= UPDATE_COMBINE | UPDATE_ZBUF_ENABLED | UPDATE_CULL_MODE;
@ -499,7 +499,7 @@ static void DrawHiresDepthBufferToScreen(FB_TO_SCREEN_INFO & fb_info)
GR_BLEND_ONE_MINUS_SRC_ALPHA, GR_BLEND_ONE_MINUS_SRC_ALPHA,
GR_BLEND_ONE, GR_BLEND_ONE,
GR_BLEND_ZERO); GR_BLEND_ZERO);
grDepthBufferFunction(GR_CMP_ALWAYS); gfxDepthBufferFunction(GR_CMP_ALWAYS);
grDepthMask(FXFALSE); grDepthMask(FXFALSE);
gfxCullMode(GR_CULL_DISABLE); gfxCullMode(GR_CULL_DISABLE);
gfxTexCombine(GR_TMU1, gfxTexCombine(GR_TMU1,

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

@ -538,7 +538,7 @@ int InitGfx()
} }
gfxDepthBufferMode(GR_DEPTHBUFFER_ZBUFFER); gfxDepthBufferMode(GR_DEPTHBUFFER_ZBUFFER);
grDepthBufferFunction(GR_CMP_LESS); gfxDepthBufferFunction(GR_CMP_LESS);
grDepthMask(FXTRUE); grDepthMask(FXTRUE);
ChangeSize(); ChangeSize();
@ -548,7 +548,7 @@ int InitGfx()
gfxCullMode(GR_CULL_DISABLE); gfxCullMode(GR_CULL_DISABLE);
gfxDepthBufferMode(GR_DEPTHBUFFER_ZBUFFER); gfxDepthBufferMode(GR_DEPTHBUFFER_ZBUFFER);
grDepthBufferFunction(GR_CMP_ALWAYS); gfxDepthBufferFunction(GR_CMP_ALWAYS);
grRenderBuffer(GR_BUFFER_BACKBUFFER); grRenderBuffer(GR_BUFFER_BACKBUFFER);
gfxColorMask(FXTRUE, FXTRUE); gfxColorMask(FXTRUE, FXTRUE);
grDepthMask(FXTRUE); grDepthMask(FXTRUE);
@ -1318,7 +1318,7 @@ void newSwapBuffers()
rdp.update |= UPDATE_SCISSOR | UPDATE_COMBINE | UPDATE_ZBUF_ENABLED | UPDATE_CULL_MODE; rdp.update |= UPDATE_SCISSOR | UPDATE_COMBINE | UPDATE_ZBUF_ENABLED | UPDATE_CULL_MODE;
gfxClipWindow(0, 0, g_scr_res_x, g_scr_res_y); gfxClipWindow(0, 0, g_scr_res_x, g_scr_res_y);
grDepthBufferFunction(GR_CMP_ALWAYS); gfxDepthBufferFunction(GR_CMP_ALWAYS);
grDepthMask(FXFALSE); grDepthMask(FXFALSE);
gfxCullMode(GR_CULL_DISABLE); gfxCullMode(GR_CULL_DISABLE);

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

@ -240,8 +240,7 @@ void gfxDepthBufferMode(GrDepthBufferMode_t mode)
} }
} }
FX_ENTRY void FX_CALL void gfxDepthBufferFunction(GrCmpFnc_t function)
grDepthBufferFunction(GrCmpFnc_t function)
{ {
WriteTrace(TraceGlitch, TraceDebug, "function: %d", function); WriteTrace(TraceGlitch, TraceDebug, "function: %d", function);
switch (function) switch (function)

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

@ -171,8 +171,7 @@ void gfxDepthBufferMode(GrDepthBufferMode_t mode)
grDisplayGLError("gfxDepthBufferMode"); grDisplayGLError("gfxDepthBufferMode");
} }
FX_ENTRY void FX_CALL void gfxDepthBufferFunction(GrCmpFnc_t function)
grDepthBufferFunction(GrCmpFnc_t function)
{ {
WriteTrace(TraceGlitch, TraceDebug, "function: %d", function); WriteTrace(TraceGlitch, TraceDebug, "function: %d", function);
switch (function) switch (function)
@ -217,7 +216,7 @@ grDepthBufferFunction(GrCmpFnc_t function)
default: default:
WriteTrace(TraceGlitch, TraceWarning, "unknown depth buffer function : %x", function); WriteTrace(TraceGlitch, TraceWarning, "unknown depth buffer function : %x", function);
} }
grDisplayGLError("grDepthBufferFunction"); grDisplayGLError("gfxDepthBufferFunction");
} }
FX_ENTRY void FX_CALL FX_ENTRY void FX_CALL

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

@ -44,6 +44,7 @@ void gfxConstantColorValueExt(GrChipID_t tmu, GrColor_t value);
void gfxVertexLayout(FxU32 param, FxI32 offset, FxU32 mode); void gfxVertexLayout(FxU32 param, FxI32 offset, FxU32 mode);
void gfxCullMode(GrCullMode_t mode); void gfxCullMode(GrCullMode_t mode);
void gfxDepthBufferMode(GrDepthBufferMode_t mode); void gfxDepthBufferMode(GrDepthBufferMode_t mode);
void gfxDepthBufferFunction(GrCmpFnc_t function);
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;

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

@ -340,7 +340,7 @@ static GrTextureFormat_t TexBufSetupCombiner(int force_rgb = FALSE)
GR_BLEND_ONE, GR_BLEND_ONE,
GR_BLEND_ZERO); GR_BLEND_ZERO);
gfxClipWindow(0, 0, g_scr_res_x, g_scr_res_y); gfxClipWindow(0, 0, g_scr_res_x, g_scr_res_y);
grDepthBufferFunction(GR_CMP_ALWAYS); gfxDepthBufferFunction(GR_CMP_ALWAYS);
grDepthMask(FXFALSE); grDepthMask(FXFALSE);
gfxCullMode(GR_CULL_DISABLE); gfxCullMode(GR_CULL_DISABLE);
gfxFogMode(GR_FOG_DISABLE); gfxFogMode(GR_FOG_DISABLE);

12
Source/Project64-video/Util.cpp
View File

@ -1752,27 +1752,27 @@ void update()
switch ((rdp.rm & 0xC00) >> 10) { switch ((rdp.rm & 0xC00) >> 10) {
case 0: case 0:
grDepthBiasLevel(0); grDepthBiasLevel(0);
grDepthBufferFunction(g_settings->zmode_compare_less() ? GR_CMP_LESS : GR_CMP_LEQUAL); gfxDepthBufferFunction(g_settings->zmode_compare_less() ? GR_CMP_LESS : GR_CMP_LEQUAL);
break; break;
case 1: case 1:
grDepthBiasLevel(-4); grDepthBiasLevel(-4);
grDepthBufferFunction(g_settings->zmode_compare_less() ? GR_CMP_LESS : GR_CMP_LEQUAL); gfxDepthBufferFunction(g_settings->zmode_compare_less() ? GR_CMP_LESS : GR_CMP_LEQUAL);
break; break;
case 2: case 2:
grDepthBiasLevel(g_settings->ucode() == CSettings::ucode_PerfectDark ? -4 : 0); grDepthBiasLevel(g_settings->ucode() == CSettings::ucode_PerfectDark ? -4 : 0);
grDepthBufferFunction(GR_CMP_LESS); gfxDepthBufferFunction(GR_CMP_LESS);
break; break;
case 3: case 3:
// will be set dynamically per polygon // will be set dynamically per polygon
//grDepthBiasLevel(-deltaZ); //grDepthBiasLevel(-deltaZ);
grDepthBufferFunction(GR_CMP_LEQUAL); gfxDepthBufferFunction(GR_CMP_LEQUAL);
break; break;
} }
} }
else else
{ {
grDepthBiasLevel(0); grDepthBiasLevel(0);
grDepthBufferFunction(GR_CMP_ALWAYS); gfxDepthBufferFunction(GR_CMP_ALWAYS);
} }
if (rdp.flags & ZBUF_UPDATE) if (rdp.flags & ZBUF_UPDATE)
@ -1783,7 +1783,7 @@ void update()
else else
{ {
grDepthBiasLevel(0); grDepthBiasLevel(0);
grDepthBufferFunction(GR_CMP_ALWAYS); gfxDepthBufferFunction(GR_CMP_ALWAYS);
grDepthMask(FXFALSE); grDepthMask(FXFALSE);
} }
} }

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

@ -2521,7 +2521,7 @@ void rdp_fillrect()
gfxCullMode(GR_CULL_DISABLE); gfxCullMode(GR_CULL_DISABLE);
gfxFogMode(GR_FOG_DISABLE); gfxFogMode(GR_FOG_DISABLE);
grDepthBufferFunction(GR_CMP_ALWAYS); gfxDepthBufferFunction(GR_CMP_ALWAYS);
grDepthMask(FXFALSE); grDepthMask(FXFALSE);
rdp.update |= UPDATE_COMBINE | UPDATE_CULL_MODE | UPDATE_FOG_ENABLED | UPDATE_ZBUF_ENABLED; rdp.update |= UPDATE_COMBINE | UPDATE_CULL_MODE | UPDATE_FOG_ENABLED | UPDATE_ZBUF_ENABLED;

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

@ -172,7 +172,7 @@ void DrawHiresDepthImage(const DRAWIMAGE & d)
GR_BLEND_ZERO, GR_BLEND_ZERO,
GR_BLEND_ONE, GR_BLEND_ONE,
GR_BLEND_ZERO); GR_BLEND_ZERO);
grDepthBufferFunction(GR_CMP_ALWAYS); gfxDepthBufferFunction(GR_CMP_ALWAYS);
grDepthMask(FXFALSE); grDepthMask(FXFALSE);
GrLOD_t LOD = g_scr_res_x > 1024 ? GFX_LOD_LOG2_2048 : GFX_LOD_LOG2_1024; GrLOD_t LOD = g_scr_res_x > 1024 ? GFX_LOD_LOG2_2048 : GFX_LOD_LOG2_1024;