Deprecate c3d/renderbuffer.h (use framebuffer or renderqueue instead)

This commit is contained in:
fincs 2017-02-14 18:35:37 +01:00
parent a382eeed2b
commit 73f4039a9c
4 changed files with 20 additions and 9 deletions

View File

@ -1,27 +1,31 @@
#pragma once #pragma once
#include "texture.h" #include "texture.h"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
typedef struct typedef struct C3D_DEPRECATED
{ {
C3D_Tex colorBuf, depthBuf; C3D_Tex colorBuf, depthBuf;
u32 clearColor, clearDepth; u32 clearColor, clearDepth;
int depthFmt; int depthFmt;
} C3D_RenderBuf; } C3D_RenderBuf;
bool C3D_RenderBufInit(C3D_RenderBuf* rb, int width, int height, int colorFmt, int depthFmt); C3D_DEPRECATED bool C3D_RenderBufInit(C3D_RenderBuf* rb, int width, int height, int colorFmt, int depthFmt);
void C3D_RenderBufClearAsync(C3D_RenderBuf* rb); C3D_DEPRECATED void C3D_RenderBufClearAsync(C3D_RenderBuf* rb);
void C3D_RenderBufTransferAsync(C3D_RenderBuf* rb, u32* frameBuf, u32 flags); C3D_DEPRECATED void C3D_RenderBufTransferAsync(C3D_RenderBuf* rb, u32* frameBuf, u32 flags);
void C3D_RenderBufBind(C3D_RenderBuf* rb); C3D_DEPRECATED void C3D_RenderBufBind(C3D_RenderBuf* rb);
void C3D_RenderBufDelete(C3D_RenderBuf* rb); C3D_DEPRECATED void C3D_RenderBufDelete(C3D_RenderBuf* rb);
static inline void C3D_RenderBufClear(C3D_RenderBuf* rb) C3D_DEPRECATED static inline void C3D_RenderBufClear(C3D_RenderBuf* rb)
{ {
C3D_RenderBufClearAsync(rb); C3D_RenderBufClearAsync(rb);
gspWaitForPSC0(); gspWaitForPSC0();
} }
static inline void C3D_RenderBufTransfer(C3D_RenderBuf* rb, u32* frameBuf, u32 flags) C3D_DEPRECATED static inline void C3D_RenderBufTransfer(C3D_RenderBuf* rb, u32* frameBuf, u32 flags)
{ {
C3D_RenderBufTransferAsync(rb, frameBuf, flags); C3D_RenderBufTransferAsync(rb, frameBuf, flags);
gspWaitForPPF(); gspWaitForPPF();
} }
#pragma GCC diagnostic pop

View File

@ -8,6 +8,12 @@ typedef uint8_t u8;
typedef uint32_t u32; typedef uint32_t u32;
#endif #endif
#ifndef CITRO3D_NO_DEPRECATION
#define C3D_DEPRECATED __attribute__ ((deprecated))
#else
#define C3D_DEPRECATED
#endif
typedef u32 C3D_IVec; typedef u32 C3D_IVec;
static inline C3D_IVec IVec_Pack(u8 x, u8 y, u8 z, u8 w) static inline C3D_IVec IVec_Pack(u8 x, u8 y, u8 z, u8 w)

View File

@ -25,7 +25,7 @@ extern "C" {
#include "c3d/lightlut.h" #include "c3d/lightlut.h"
#include "c3d/framebuffer.h" #include "c3d/framebuffer.h"
#include "c3d/renderbuffer.h" #include "c3d/renderbuffer.h" // Deprecated
#include "c3d/renderqueue.h" #include "c3d/renderqueue.h"
#ifdef __cplusplus #ifdef __cplusplus

View File

@ -1,3 +1,4 @@
#define CITRO3D_NO_DEPRECATION
#include "internal.h" #include "internal.h"
#include <c3d/base.h> #include <c3d/base.h>
#include <c3d/renderbuffer.h> #include <c3d/renderbuffer.h>