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

Remove deprecated functionality

Browse Source
This commit is contained in:
fincs 2018-05-22 16:56:19 +02:00
parent 81ca5d3575
commit 8d8979947e
3 changed files with 0 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/c3d/renderqueue.h
View File

@ -14,9 +14,7 @@ struct C3D_RenderTarget_tag
bool linked; bool linked;
gfxScreen_t screen; gfxScreen_t screen;
gfx3dSide_t side; gfx3dSide_t side;
C3D_ClearBits clearBits;
u32 transferFlags; u32 transferFlags;
u32 clearColor, clearDepth;
}; };
// Flags for C3D_FrameBegin // Flags for C3D_FrameBegin
@ -64,7 +62,6 @@ public:
C3D_RenderTarget* C3D_RenderTargetCreate(int width, int height, GPU_COLORBUF colorFmt, C3D_DEPTHTYPE depthFmt); C3D_RenderTarget* C3D_RenderTargetCreate(int width, int height, GPU_COLORBUF colorFmt, C3D_DEPTHTYPE depthFmt);
C3D_RenderTarget* C3D_RenderTargetCreateFromTex(C3D_Tex* tex, GPU_TEXFACE face, int level, C3D_DEPTHTYPE depthFmt); C3D_RenderTarget* C3D_RenderTargetCreateFromTex(C3D_Tex* tex, GPU_TEXFACE face, int level, C3D_DEPTHTYPE depthFmt);
void C3D_RenderTargetDelete(C3D_RenderTarget* target); void C3D_RenderTargetDelete(C3D_RenderTarget* target);
C3D_DEPRECATED void C3D_RenderTargetSetClear(C3D_RenderTarget* target, C3D_ClearBits clearBits, u32 clearColor, u32 clearDepth);
void C3D_RenderTargetSetOutput(C3D_RenderTarget* target, gfxScreen_t screen, gfx3dSide_t side, u32 transferFlags); void C3D_RenderTargetSetOutput(C3D_RenderTarget* target, gfxScreen_t screen, gfx3dSide_t side, u32 transferFlags);
static inline void C3D_RenderTargetClear(C3D_RenderTarget* target, C3D_ClearBits clearBits, u32 clearColor, u32 clearDepth) static inline void C3D_RenderTargetClear(C3D_RenderTarget* target, C3D_ClearBits clearBits, u32 clearColor, u32 clearDepth)
@ -72,10 +69,6 @@ static inline void C3D_RenderTargetClear(C3D_RenderTarget* target, C3D_ClearBits
C3D_FrameBufClear(&target->frameBuf, clearBits, clearColor, clearDepth); C3D_FrameBufClear(&target->frameBuf, clearBits, clearColor, clearDepth);
} }
C3D_DEPRECATED void C3D_SafeDisplayTransfer(u32* inadr, u32 indim, u32* outadr, u32 outdim, u32 flags);
C3D_DEPRECATED void C3D_SafeTextureCopy(u32* inadr, u32 indim, u32* outadr, u32 outdim, u32 size, u32 flags);
C3D_DEPRECATED void C3D_SafeMemoryFill(u32* buf0a, u32 buf0v, u32* buf0e, u16 control0, u32* buf1a, u32 buf1v, u32* buf1e, u16 control1);
void C3D_SyncDisplayTransfer(u32* inadr, u32 indim, u32* outadr, u32 outdim, u32 flags); void C3D_SyncDisplayTransfer(u32* inadr, u32 indim, u32* outadr, u32 outdim, u32 flags);
void C3D_SyncTextureCopy(u32* inadr, u32 indim, u32* outadr, u32 outdim, u32 size, u32 flags); void C3D_SyncTextureCopy(u32* inadr, u32 indim, u32* outadr, u32 outdim, u32 size, u32 flags);
void C3D_SyncMemoryFill(u32* buf0a, u32 buf0v, u32* buf0e, u16 control0, u32* buf1a, u32 buf1v, u32* buf1e, u16 control1); void C3D_SyncMemoryFill(u32* buf0a, u32 buf0v, u32* buf0e, u16 control0, u32* buf1a, u32 buf1v, u32* buf1e, u16 control1);

14
include/c3d/texenv.h
View File

@ -46,11 +46,6 @@ static inline void C3D_TexEnvInit(C3D_TexEnv* env)
#define _C3D_DEFAULT(x) #define _C3D_DEFAULT(x)
#endif #endif
C3D_DEPRECATED static inline void TexEnv_Init(C3D_TexEnv* env)
{
C3D_TexEnvInit(env);
}
static inline void C3D_TexEnvSrc(C3D_TexEnv* env, C3D_TexEnvMode mode, static inline void C3D_TexEnvSrc(C3D_TexEnv* env, C3D_TexEnvMode mode,
GPU_TEVSRC s1, GPU_TEVSRC s1,
GPU_TEVSRC s2 _C3D_DEFAULT(GPU_PRIMARY_COLOR), GPU_TEVSRC s2 _C3D_DEFAULT(GPU_PRIMARY_COLOR),
@ -63,15 +58,6 @@ static inline void C3D_TexEnvSrc(C3D_TexEnv* env, C3D_TexEnvMode mode,
env->srcAlpha = param; env->srcAlpha = param;
} }
C3D_DEPRECATED static inline void C3D_TexEnvOp(C3D_TexEnv* env, C3D_TexEnvMode mode, int o1, int o2, int o3)
{
int param = GPU_TEVOPERANDS(o1, o2, o3);
if ((int)mode & C3D_RGB)
env->opRgb = param;
if ((int)mode & C3D_Alpha)
env->opAlpha = param;
}
static inline void C3D_TexEnvOpRgb(C3D_TexEnv* env, static inline void C3D_TexEnvOpRgb(C3D_TexEnv* env,
GPU_TEVOP_RGB o1, GPU_TEVOP_RGB o1,
GPU_TEVOP_RGB o2 _C3D_DEFAULT(GPU_TEVOP_RGB_SRC_COLOR), GPU_TEVOP_RGB o2 _C3D_DEFAULT(GPU_TEVOP_RGB_SRC_COLOR),

43
source/renderqueue.c
View File

@ -55,10 +55,6 @@ static void onVBlank0(C3D_UNUSED void* unused)
C3D_FrameBufTransfer(&left->frameBuf, GFX_TOP, GFX_LEFT, left->transferFlags); C3D_FrameBufTransfer(&left->frameBuf, GFX_TOP, GFX_LEFT, left->transferFlags);
if (right) if (right)
C3D_FrameBufTransfer(&right->frameBuf, GFX_TOP, GFX_RIGHT, right->transferFlags); C3D_FrameBufTransfer(&right->frameBuf, GFX_TOP, GFX_RIGHT, right->transferFlags);
if (left && left->clearBits)
C3D_FrameBufClear(&left->frameBuf, left->clearBits, left->clearColor, left->clearDepth);
if (right && right != left && right->clearBits)
C3D_FrameBufClear(&right->frameBuf, right->clearBits, right->clearColor, right->clearDepth);
gfxConfigScreen(GFX_TOP, false); gfxConfigScreen(GFX_TOP, false);
} }
} }
@ -76,8 +72,6 @@ static void onVBlank1(C3D_UNUSED void* unused)
{ {
frameStage |= STAGE_WAIT_TRANSFER; frameStage |= STAGE_WAIT_TRANSFER;
C3D_FrameBufTransfer(&target->frameBuf, GFX_BOTTOM, GFX_LEFT, target->transferFlags); C3D_FrameBufTransfer(&target->frameBuf, GFX_BOTTOM, GFX_LEFT, target->transferFlags);
if (target->clearBits)
C3D_FrameBufClear(&target->frameBuf, target->clearBits, target->clearColor, target->clearDepth);
gfxConfigScreen(GFX_BOTTOM, false); gfxConfigScreen(GFX_BOTTOM, false);
} }
} }
@ -270,14 +264,6 @@ void C3D_FrameEnd(u8 flags)
frameStage |= STAGE_HAS_TRANSFER(i); frameStage |= STAGE_HAS_TRANSFER(i);
} }
for (target = firstTarget; target; target = target->next)
{
if (!target->used || !target->clearBits)
continue;
target->used = false;
C3D_FrameBufClear(&target->frameBuf, target->clearBits, target->clearColor, target->clearDepth);
}
GPUCMD_SetBuffer(ctx->cmdBuf, ctx->cmdBufSize, 0); GPUCMD_SetBuffer(ctx->cmdBuf, ctx->cmdBufSize, 0);
measureGpuTime = true; measureGpuTime = true;
osTickCounterStart(&gpuTime); osTickCounterStart(&gpuTime);
@ -407,20 +393,6 @@ void C3D_RenderTargetDelete(C3D_RenderTarget* target)
C3Di_RenderTargetDestroy(target); C3Di_RenderTargetDestroy(target);
} }
void C3D_RenderTargetSetClear(C3D_RenderTarget* target, C3D_ClearBits clearBits, u32 clearColor, u32 clearDepth)
{
if (!target->frameBuf.colorBuf) clearBits &= ~C3D_CLEAR_COLOR;
if (!target->frameBuf.depthBuf) clearBits &= ~C3D_CLEAR_DEPTH;
C3D_ClearBits oldClearBits = target->clearBits;
target->clearBits = clearBits;
target->clearColor = clearColor;
target->clearDepth = clearDepth;
if (clearBits &~ oldClearBits)
C3D_FrameBufClear(&target->frameBuf, clearBits, clearColor, clearDepth);
}
void C3D_RenderTargetSetOutput(C3D_RenderTarget* target, gfxScreen_t screen, gfx3dSide_t side, u32 transferFlags) void C3D_RenderTargetSetOutput(C3D_RenderTarget* target, gfxScreen_t screen, gfx3dSide_t side, u32 transferFlags)
{ {
int id = 0; int id = 0;
@ -459,21 +431,6 @@ static void C3Di_SafeMemoryFill(u32* buf0a, u32 buf0v, u32* buf0e, u16 control0,
gxCmdQueueRun(&C3Di_GetContext()->gxQueue); gxCmdQueueRun(&C3Di_GetContext()->gxQueue);
} }
void C3D_SafeDisplayTransfer(u32* inadr, u32 indim, u32* outadr, u32 outdim, u32 flags)
{
C3Di_SafeDisplayTransfer(inadr, indim, outadr, outdim, flags);
}
void C3D_SafeTextureCopy(u32* inadr, u32 indim, u32* outadr, u32 outdim, u32 size, u32 flags)
{
C3Di_SafeTextureCopy(inadr, indim, outadr, outdim, size, flags);
}
void C3D_SafeMemoryFill(u32* buf0a, u32 buf0v, u32* buf0e, u16 control0, u32* buf1a, u32 buf1v, u32* buf1e, u16 control1)
{
C3Di_SafeMemoryFill(buf0a, buf0v, buf0e, control0, buf1a, buf1v, buf1e, control1);
}
void C3D_SyncDisplayTransfer(u32* inadr, u32 indim, u32* outadr, u32 outdim, u32 flags) void C3D_SyncDisplayTransfer(u32* inadr, u32 indim, u32* outadr, u32 outdim, u32 flags)
{ {
if (inFrame) if (inFrame)