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

Refactor gpu.h/gpu.c, see details:

Browse Source 
- Added GPUCMD_Split for splitting the command buffer
  (and beginning a new command list within the same buffer)
- Deprecated GPUCMD_Finalize/Run/FlushAndRun:
  - Use GPUCMD_Split + GX_ProcessCommandList instead
- Turned GPUCMD_SetBuffer/SetBufferOffset/GetBuffer into inlines
- GPUCMD_Add: svcBreak on cmdbuf overflow
This commit is contained in:
fincs 2017-03-26 19:37:25 +02:00
parent 929468371a
commit d8374c2883
2 changed files with 45 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
libctru/include/3ds/gpu/gpu.h
View File

@ -20,21 +20,34 @@ extern u32 gpuCmdBufOffset; ///< GPU command buffer offset.
* @param size Size of the command buffer. * @param size Size of the command buffer.
* @param offset Offset of the command buffer. * @param offset Offset of the command buffer.
*/ */
void GPUCMD_SetBuffer(u32* adr, u32 size, u32 offset); static inline void GPUCMD_SetBuffer(u32* adr, u32 size, u32 offset)
{
gpuCmdBuf=adr;
gpuCmdBufSize=size;
gpuCmdBufOffset=offset;
}
/** /**
* @brief Sets the offset of the GPU command buffer. * @brief Sets the offset of the GPU command buffer.
* @param offset Offset of the command buffer. * @param offset Offset of the command buffer.
*/ */
void GPUCMD_SetBufferOffset(u32 offset); static inline void GPUCMD_SetBufferOffset(u32 offset)
{
gpuCmdBufOffset=offset;
}
/** /**
* @brief Gets the current GPU command buffer. * @brief Gets the current GPU command buffer.
* @param adr Pointer to output the command buffer to. * @param addr Pointer to output the command buffer to.
* @param size Pointer to output the size of the command buffer to. * @param size Pointer to output the size (in words) of the command buffer to.
* @param offset Pointer to output the offset of the command buffer to. * @param offset Pointer to output the offset of the command buffer to.
*/ */
void GPUCMD_GetBuffer(u32** adr, u32* size, u32* offset); static inline void GPUCMD_GetBuffer(u32** addr, u32* size, u32* offset)
{
if(addr)*addr=gpuCmdBuf;
if(size)*size=gpuCmdBufSize;
if(offset)*offset=gpuCmdBufOffset;
}
/** /**
* @brief Adds raw GPU commands to the current command buffer. * @brief Adds raw GPU commands to the current command buffer.
@ -44,10 +57,10 @@ void GPUCMD_GetBuffer(u32** adr, u32* size, u32* offset);
void GPUCMD_AddRawCommands(const u32* cmd, u32 size); void GPUCMD_AddRawCommands(const u32* cmd, u32 size);
/// Executes the GPU command buffer. /// Executes the GPU command buffer.
void GPUCMD_Run(void); DEPRECATED void GPUCMD_Run(void);
/// Flushes linear memory and executes the GPU command buffer. /// Flushes linear memory and executes the GPU command buffer.
void GPUCMD_FlushAndRun(void); DEPRECATED void GPUCMD_FlushAndRun(void);
/** /**
* @brief Adds a GPU command to the current command buffer. * @brief Adds a GPU command to the current command buffer.
@ -57,8 +70,15 @@ void GPUCMD_FlushAndRun(void);
*/ */
void GPUCMD_Add(u32 header, const u32* param, u32 paramlength); void GPUCMD_Add(u32 header, const u32* param, u32 paramlength);
/**
* @brief Splits the current GPU command buffer.
* @param addr Pointer to output the command buffer to.
* @param size Pointer to output the size (in words) of the command buffer to.
*/
void GPUCMD_Split(u32** addr, u32* size);
/// Finalizes the GPU command buffer. /// Finalizes the GPU command buffer.
void GPUCMD_Finalize(void); DEPRECATED void GPUCMD_Finalize(void);
/** /**
* @brief Converts a 32-bit float to a 16-bit float. * @brief Converts a 32-bit float to a 16-bit float.

37
libctru/source/gpu/gpu.c
View File

@ -5,6 +5,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <3ds/types.h> #include <3ds/types.h>
#include <3ds/svc.h>
#include <3ds/gpu/gpu.h> #include <3ds/gpu/gpu.h>
#include <3ds/gpu/gx.h> #include <3ds/gpu/gx.h>
#include <3ds/gpu/shbin.h> #include <3ds/gpu/shbin.h>
@ -13,25 +14,6 @@ u32* gpuCmdBuf;
u32 gpuCmdBufSize; u32 gpuCmdBufSize;
u32 gpuCmdBufOffset; u32 gpuCmdBufOffset;
void GPUCMD_SetBuffer(u32* adr, u32 size, u32 offset)
{
gpuCmdBuf=adr;
gpuCmdBufSize=size;
gpuCmdBufOffset=offset;
}
void GPUCMD_SetBufferOffset(u32 offset)
{
gpuCmdBufOffset=offset;
}
void GPUCMD_GetBuffer(u32** adr, u32* size, u32* offset)
{
if(adr)*adr=gpuCmdBuf;
if(size)*size=gpuCmdBufSize;
if(offset)*offset=gpuCmdBufOffset;
}
void GPUCMD_AddRawCommands(const u32* cmd, u32 size) void GPUCMD_AddRawCommands(const u32* cmd, u32 size)
{ {
if(!cmd || !size)return; if(!cmd || !size)return;
@ -58,7 +40,8 @@ void GPUCMD_FlushAndRun(void)
void GPUCMD_Add(u32 header, const u32* param, u32 paramlength) void GPUCMD_Add(u32 header, const u32* param, u32 paramlength)
{ {
if(!paramlength)paramlength=1; if(!paramlength)paramlength=1;
if(!gpuCmdBuf || gpuCmdBufOffset+paramlength+1>gpuCmdBufSize)return; if(!gpuCmdBuf || gpuCmdBufOffset+paramlength+1>gpuCmdBufSize)
svcBreak(USERBREAK_PANIC); // Shouldn't happen.
paramlength--; paramlength--;
header|=(paramlength&0x7ff)<<20; header|=(paramlength&0x7ff)<<20;
@ -77,6 +60,20 @@ void GPUCMD_Add(u32 header, const u32* param, u32 paramlength)
if(paramlength&1)gpuCmdBuf[gpuCmdBufOffset++]=0x00000000; //alignment if(paramlength&1)gpuCmdBuf[gpuCmdBufOffset++]=0x00000000; //alignment
} }
void GPUCMD_Split(u32** addr, u32* size)
{
GPUCMD_AddWrite(GPUREG_FINALIZE, 0x12345678);
if (gpuCmdBufOffset & 3)
GPUCMD_AddWrite(GPUREG_FINALIZE, 0x12345678); // 16-byte align the buffer
if (addr) *addr = gpuCmdBuf;
if (size) *size = gpuCmdBufOffset;
gpuCmdBuf += gpuCmdBufOffset;
gpuCmdBufSize -= gpuCmdBufOffset;
gpuCmdBufOffset = 0;
}
void GPUCMD_Finalize(void) void GPUCMD_Finalize(void)
{ {
GPUCMD_AddMaskedWrite(GPUREG_PRIMITIVE_CONFIG, 0x8, 0x00000000); GPUCMD_AddMaskedWrite(GPUREG_PRIMITIVE_CONFIG, 0x8, 0x00000000);