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

[Video] Change GrDepthBufferMode_t to gfxDepthBufferMode_t

This commit is contained in:
zilmar 2017-08-03 08:02:52 +10:00
parent bcfa8fbf75
commit e1fe202999
5 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -529,7 +529,7 @@ int InitGfx()
gfxVertexLayout(GR_PARAM_FOG_EXT, offsetof(VERTEX, f), GR_PARAM_ENABLE); gfxVertexLayout(GR_PARAM_FOG_EXT, offsetof(VERTEX, f), GR_PARAM_ENABLE);
} }
gfxDepthBufferMode(GR_DEPTHBUFFER_ZBUFFER); gfxDepthBufferMode(GFX_DEPTHBUFFER_ZBUFFER);
gfxDepthBufferFunction(GFX_CMP_LESS); gfxDepthBufferFunction(GFX_CMP_LESS);
gfxDepthMask(FXTRUE); gfxDepthMask(FXTRUE);
@ -539,7 +539,7 @@ int InitGfx()
ClearCache(); ClearCache();
gfxCullMode(GFX_CULL_DISABLE); gfxCullMode(GFX_CULL_DISABLE);
gfxDepthBufferMode(GR_DEPTHBUFFER_ZBUFFER); gfxDepthBufferMode(GFX_DEPTHBUFFER_ZBUFFER);
gfxDepthBufferFunction(GFX_CMP_ALWAYS); gfxDepthBufferFunction(GFX_CMP_ALWAYS);
gfxRenderBuffer(GFX_BUFFER_BACKBUFFER); gfxRenderBuffer(GFX_BUFFER_BACKBUFFER);
gfxColorMask(FXTRUE, FXTRUE); gfxColorMask(FXTRUE, FXTRUE);

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

@ -216,22 +216,22 @@ void gfxCullMode(gfxCullMode_t mode)
// Depth buffer // Depth buffer
void gfxDepthBufferMode(GrDepthBufferMode_t mode) void gfxDepthBufferMode(gfxDepthBufferMode_t mode)
{ {
WriteTrace(TraceGlitch, TraceDebug, "mode: %d", mode); WriteTrace(TraceGlitch, TraceDebug, "mode: %d", mode);
switch (mode) switch (mode)
{ {
case GR_DEPTHBUFFER_DISABLE: case GFX_DEPTHBUFFER_DISABLE:
glDisable(GL_DEPTH_TEST); glDisable(GL_DEPTH_TEST);
w_buffer_mode = 0; w_buffer_mode = 0;
return; return;
case GR_DEPTHBUFFER_WBUFFER: case GFX_DEPTHBUFFER_WBUFFER:
case GR_DEPTHBUFFER_WBUFFER_COMPARE_TO_BIAS: case GFX_DEPTHBUFFER_WBUFFER_COMPARE_TO_BIAS:
glEnable(GL_DEPTH_TEST); glEnable(GL_DEPTH_TEST);
w_buffer_mode = 1; w_buffer_mode = 1;
break; break;
case GR_DEPTHBUFFER_ZBUFFER: case GFX_DEPTHBUFFER_ZBUFFER:
case GR_DEPTHBUFFER_ZBUFFER_COMPARE_TO_BIAS: case GFX_DEPTHBUFFER_ZBUFFER_COMPARE_TO_BIAS:
glEnable(GL_DEPTH_TEST); glEnable(GL_DEPTH_TEST);
w_buffer_mode = 0; w_buffer_mode = 0;
break; break;

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

@ -146,22 +146,22 @@ void gfxCullMode(gfxCullMode_t mode)
} }
// Depth buffer // Depth buffer
void gfxDepthBufferMode(GrDepthBufferMode_t mode) void gfxDepthBufferMode(gfxDepthBufferMode_t mode)
{ {
WriteTrace(TraceGlitch, TraceDebug, "mode: %d", mode); WriteTrace(TraceGlitch, TraceDebug, "mode: %d", mode);
switch (mode) switch (mode)
{ {
case GR_DEPTHBUFFER_DISABLE: case GFX_DEPTHBUFFER_DISABLE:
glDisable(GL_DEPTH_TEST); glDisable(GL_DEPTH_TEST);
w_buffer_mode = 0; w_buffer_mode = 0;
return; return;
case GR_DEPTHBUFFER_WBUFFER: case GFX_DEPTHBUFFER_WBUFFER:
case GR_DEPTHBUFFER_WBUFFER_COMPARE_TO_BIAS: case GFX_DEPTHBUFFER_WBUFFER_COMPARE_TO_BIAS:
glEnable(GL_DEPTH_TEST); glEnable(GL_DEPTH_TEST);
w_buffer_mode = 1; w_buffer_mode = 1;
break; break;
case GR_DEPTHBUFFER_ZBUFFER: case GFX_DEPTHBUFFER_ZBUFFER:
case GR_DEPTHBUFFER_ZBUFFER_COMPARE_TO_BIAS: case GFX_DEPTHBUFFER_ZBUFFER_COMPARE_TO_BIAS:
glEnable(GL_DEPTH_TEST); glEnable(GL_DEPTH_TEST);
w_buffer_mode = 0; w_buffer_mode = 0;
break; break;

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

@ -42,7 +42,7 @@ void gfxTexAlphaCombineExt(gfxChipID_t tmu, gfxTACUColor_t a, gfxCombineMode_t a
void gfxConstantColorValueExt(gfxChipID_t tmu, gfxColor_t value); void gfxConstantColorValueExt(gfxChipID_t tmu, gfxColor_t value);
void gfxVertexLayout(uint32_t param, FxI32 offset, uint32_t mode); void gfxVertexLayout(uint32_t param, FxI32 offset, uint32_t mode);
void gfxCullMode(gfxCullMode_t mode); void gfxCullMode(gfxCullMode_t mode);
void gfxDepthBufferMode(GrDepthBufferMode_t mode); void gfxDepthBufferMode(gfxDepthBufferMode_t mode);
void gfxDepthBufferFunction(gfxCmpFnc_t function); void gfxDepthBufferFunction(gfxCmpFnc_t function);
void gfxDepthMask(bool mask); void gfxDepthMask(bool mask);
void gfxDrawTriangle(const void *a, const void *b, const void *c); void gfxDrawTriangle(const void *a, const void *b, const void *c);

9
Source/Project64-video/Renderer/types.h
View File

@ -246,6 +246,15 @@ enum gfxChipID_t
GFX_TMU2 = 0x2, GFX_TMU2 = 0x2,
}; };
enum gfxDepthBufferMode_t
{
GFX_DEPTHBUFFER_DISABLE = 0x0,
GFX_DEPTHBUFFER_ZBUFFER = 0x1,
GFX_DEPTHBUFFER_WBUFFER = 0x2,
GFX_DEPTHBUFFER_ZBUFFER_COMPARE_TO_BIAS = 0x3,
GFX_DEPTHBUFFER_WBUFFER_COMPARE_TO_BIAS = 0x4,
};
enum gfxChromakeyMode_t enum gfxChromakeyMode_t
{ {
GFX_CHROMAKEY_DISABLE = 0x0, GFX_CHROMAKEY_DISABLE = 0x0,