DevKit7/citro3d
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

C3D_DepthRange() -> C3D_DepthMap()

Browse Source
This commit is contained in:
fincs 2015-03-07 17:02:38 +01:00
parent a53124d98c
commit 87d4751a87
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/c3d/effect.h
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include "types.h" #include "types.h"
void C3D_DepthRange(float near, float far); void C3D_DepthMap(float zScale, float zOffset);
void C3D_CullFace(GPU_CULLMODE mode); void C3D_CullFace(GPU_CULLMODE mode);
void C3D_StencilTest(bool enable, GPU_TESTFUNC function, int ref, int mask, int replace); void C3D_StencilTest(bool enable, GPU_TESTFUNC function, int ref, int mask, int replace);
void C3D_StencilOp(GPU_STENCILOP sfail, GPU_STENCILOP dfail, GPU_STENCILOP pass); void C3D_StencilOp(GPU_STENCILOP sfail, GPU_STENCILOP dfail, GPU_STENCILOP pass);

2
source/base.c
View File

@ -63,7 +63,7 @@ bool C3D_Init(size_t cmdBufSize)
ctx->flags = C3DiF_Active | C3DiF_TexEnvAll | C3DiF_Effect | C3DiF_TexAll; ctx->flags = C3DiF_Active | C3DiF_TexEnvAll | C3DiF_Effect | C3DiF_TexAll;
// TODO: replace with direct struct access // TODO: replace with direct struct access
C3D_DepthRange(-1.0f, 0.0f); C3D_DepthMap(-1.0f, 0.0f);
C3D_CullFace(GPU_CULL_BACK_CCW); C3D_CullFace(GPU_CULL_BACK_CCW);
C3D_StencilTest(false, GPU_ALWAYS, 0x00, 0xFF, 0x00); C3D_StencilTest(false, GPU_ALWAYS, 0x00, 0xFF, 0x00);
C3D_StencilOp(GPU_KEEP, GPU_KEEP, GPU_KEEP); C3D_StencilOp(GPU_KEEP, GPU_KEEP, GPU_KEEP);

2
source/context.h
View File

@ -9,7 +9,7 @@
typedef struct typedef struct
{ {
u32 drNear, drFar; u32 zScale, zOffset;
GPU_CULLMODE cullMode; GPU_CULLMODE cullMode;
u32 alphaTest; u32 alphaTest;

8
source/effect.c
View File

@ -7,11 +7,11 @@ static inline C3D_Effect* getEffect()
return &ctx->effect; return &ctx->effect;
} }
void C3D_DepthRange(float near, float far) void C3D_DepthMap(float zScale, float zOffset)
{ {
C3D_Effect* e = getEffect(); C3D_Effect* e = getEffect();
e->drNear = C3Di_Float24(near); e->zScale = C3Di_Float24(zScale);
e->drFar = C3Di_Float24(far); e->zOffset = C3Di_Float24(zOffset);
} }
void C3D_CullFace(GPU_CULLMODE mode) void C3D_CullFace(GPU_CULLMODE mode)
@ -60,7 +60,7 @@ void C3Di_EffectBind(C3D_Effect* e)
{ {
GPUCMD_AddWrite(GPUREG_006D, 0x00000001); GPUCMD_AddWrite(GPUREG_006D, 0x00000001);
GPUCMD_AddWrite(GPUREG_FACECULLING_CONFIG, e->cullMode & 0x3); GPUCMD_AddWrite(GPUREG_FACECULLING_CONFIG, e->cullMode & 0x3);
GPUCMD_AddIncrementalWrites(GPUREG_DEPTHRANGE_NEAR, (u32*)&e->drNear, 2); GPUCMD_AddIncrementalWrites(GPUREG_DEPTHMAP_SCALE, (u32*)&e->zScale, 2);
GPUCMD_AddIncrementalWrites(GPUREG_ALPHATEST_CONFIG, (u32*)&e->alphaTest, 4); GPUCMD_AddIncrementalWrites(GPUREG_ALPHATEST_CONFIG, (u32*)&e->alphaTest, 4);
GPUCMD_AddWrite(GPUREG_BLEND_COLOR, e->blendClr); GPUCMD_AddWrite(GPUREG_BLEND_COLOR, e->blendClr);
GPUCMD_AddWrite(GPUREG_BLEND_CONFIG, e->alphaBlend); GPUCMD_AddWrite(GPUREG_BLEND_CONFIG, e->alphaBlend);