Skip to content

Enable passing const u32* to DVLB_ParseFile() #593

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
HyperDir wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Enable passing const u32* to DVLB_ParseFile() #593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions libctru/include/3ds/gpu/shbin.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ typedef enum

/// DVLP data.
typedef struct{
u32 codeSize; ///< Code size.
u32* codeData; ///< Code data.
u32 opdescSize; ///< Operand description size.
u32* opcdescData; ///< Operand description data.
u32 codeSize; ///< Code size.
const u32* codeData; ///< Code data.
u32 opdescSize; ///< Operand description size.
u32* opcdescData; ///< Operand description data.
}DVLP_s;

/// DVLE constant entry data.
Expand Down Expand Up @@ -107,7 +107,7 @@ typedef struct{
* @param shbinSize Shader binary size.
* @return The parsed shader binary.
*/
DVLB_s* DVLB_ParseFile(u32* shbinData, u32 shbinSize);
DVLB_s* DVLB_ParseFile(const u32* shbinData, u32 shbinSize);

/**
* @brief Frees shader binary data.
Expand Down
4 changes: 2 additions & 2 deletions libctru/source/gpu/shaderProgram.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include <3ds/gpu/shaderProgram.h>

static void GPU_SetShaderOutmap(const u32 outmapData[8]);
static void GPU_SendShaderCode(GPU_SHADER_TYPE type, u32* data, u16 offset, u16 length);
static void GPU_SendShaderCode(GPU_SHADER_TYPE type, const u32* data, u16 offset, u16 length);
static void GPU_SendOperandDescriptors(GPU_SHADER_TYPE type, u32* data, u16 offset, u16 length);

Result shaderInstanceInit(shaderInstance_s* si, DVLE_s* dvle)
Expand Down Expand Up @@ -348,7 +348,7 @@ void GPU_SetShaderOutmap(const u32 outmapData[8])
GPUCMD_AddIncrementalWrites(GPUREG_SH_OUTMAP_TOTAL, outmapData, 8);
}

void GPU_SendShaderCode(GPU_SHADER_TYPE type, u32* data, u16 offset, u16 length)
void GPU_SendShaderCode(GPU_SHADER_TYPE type, const u32* data, u16 offset, u16 length)
{
if(!data)return;

Expand Down
6 changes: 3 additions & 3 deletions libctru/source/gpu/shbin.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include <3ds/gpu/shbin.h>

//please don't feed this an invalid SHBIN
DVLB_s* DVLB_ParseFile(u32* shbinData, u32 shbinSize)
DVLB_s* DVLB_ParseFile(const u32* shbinData, u32 shbinSize)
{
if(!shbinData)return NULL;
DVLB_s* ret=malloc(sizeof(DVLB_s));
Expand All @@ -21,7 +21,7 @@ DVLB_s* DVLB_ParseFile(u32* shbinData, u32 shbinSize)
if(!ret->DVLE)goto clean1;

//parse DVLP
u32* dvlpData=&shbinData[2+ret->numDVLE];
const u32* dvlpData=&shbinData[2+ret->numDVLE];
ret->DVLP.codeSize=dvlpData[3];
ret->DVLP.codeData=&dvlpData[dvlpData[2]/4];
ret->DVLP.opdescSize=dvlpData[5];
Expand All @@ -33,7 +33,7 @@ DVLB_s* DVLB_ParseFile(u32* shbinData, u32 shbinSize)
for(i=0;i<ret->numDVLE;i++)
{
DVLE_s* dvle=&ret->DVLE[i];
u32* dvleData=&shbinData[shbinData[2+i]/4];
const u32* dvleData=&shbinData[shbinData[2+i]/4];

dvle->dvlp=&ret->DVLP;

Expand Down