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

Updates for latest libctru and picasso

Browse Source
This commit is contained in:
fincs 2015-08-23 18:54:44 +02:00
parent 6243cc830d
commit a8ce19c3b5
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -122,7 +122,7 @@ $(OUTPUT) : $(OFILES)
@echo $(notdir $<) @echo $(notdir $<)
$(eval CURBIN := $(patsubst %.vsh,%.shbin,$(notdir $<))) $(eval CURBIN := $(patsubst %.vsh,%.shbin,$(notdir $<)))
$(eval CURH := $(patsubst %.vsh,%.vsh.h,$(notdir $<))) $(eval CURH := $(patsubst %.vsh,%.vsh.h,$(notdir $<)))
@picasso $(CURBIN) $< $(CURH) @picasso -o $(CURBIN) $< -h $(CURH)
@bin2s $(CURBIN) | $(AS) -o $@ @bin2s $(CURBIN) | $(AS) -o $@
@echo "extern const u8" `(echo $(CURBIN) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"_end[];" > `(echo $(CURBIN) | tr . _)`.h @echo "extern const u8" `(echo $(CURBIN) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"_end[];" > `(echo $(CURBIN) | tr . _)`.h
@echo "extern const u8" `(echo $(CURBIN) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"[];" >> `(echo $(CURBIN) | tr . _)`.h @echo "extern const u8" `(echo $(CURBIN) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"[];" >> `(echo $(CURBIN) | tr . _)`.h

2
examples/gputest/Makefile
View File

@ -162,7 +162,7 @@ $(OUTPUT).elf : $(OFILES)
@echo $(notdir $<) @echo $(notdir $<)
$(eval CURBIN := $(patsubst %.shader,%.shbin,$(notdir $<))) $(eval CURBIN := $(patsubst %.shader,%.shbin,$(notdir $<)))
$(eval CURH := $(patsubst %.shader,%.shader.h,$(notdir $<))) $(eval CURH := $(patsubst %.shader,%.shader.h,$(notdir $<)))
@picasso $(CURBIN) $< $(CURH) @picasso -o $(CURBIN) $< -h $(CURH)
@bin2s $(CURBIN) | $(AS) -o $@ @bin2s $(CURBIN) | $(AS) -o $@
@echo "extern const u8" `(echo $(CURBIN) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"_end[];" > `(echo $(CURBIN) | tr . _)`.h @echo "extern const u8" `(echo $(CURBIN) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"_end[];" > `(echo $(CURBIN) | tr . _)`.h
@echo "extern const u8" `(echo $(CURBIN) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"[];" >> `(echo $(CURBIN) | tr . _)`.h @echo "extern const u8" `(echo $(CURBIN) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"[];" >> `(echo $(CURBIN) | tr . _)`.h

2
include/c3d/effect.h
View File

@ -3,7 +3,7 @@
void C3D_DepthMap(float zScale, float zOffset); 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 inputMask, int writeMask);
void C3D_StencilOp(GPU_STENCILOP sfail, GPU_STENCILOP dfail, GPU_STENCILOP pass); void C3D_StencilOp(GPU_STENCILOP sfail, GPU_STENCILOP dfail, GPU_STENCILOP pass);
void C3D_BlendingColor(u32 color); void C3D_BlendingColor(u32 color);
void C3D_DepthTest(bool enable, GPU_TESTFUNC function, GPU_WRITEMASK writemask); void C3D_DepthTest(bool enable, GPU_TESTFUNC function, GPU_WRITEMASK writemask);

2
source/base.c
View File

@ -95,7 +95,7 @@ bool C3D_Init(size_t cmdBufSize)
C3D_DepthMap(-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_STENCIL_KEEP, GPU_STENCIL_KEEP, GPU_STENCIL_KEEP);
C3D_BlendingColor(0); C3D_BlendingColor(0);
C3D_DepthTest(true, GPU_GREATER, GPU_WRITE_ALL); C3D_DepthTest(true, GPU_GREATER, GPU_WRITE_ALL);
C3D_AlphaTest(false, GPU_ALWAYS, 0x00); C3D_AlphaTest(false, GPU_ALWAYS, 0x00);

4
source/effect.c
View File

@ -20,10 +20,10 @@ void C3D_CullFace(GPU_CULLMODE mode)
e->cullMode = mode; e->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 inputMask, int writeMask)
{ {
C3D_Effect* e = getEffect(); C3D_Effect* e = getEffect();
e->stencilMode = (!!enable) | ((function & 7) << 4) | (replace << 8) | (ref << 16) | (mask << 24); e->stencilMode = (!!enable) | ((function & 7) << 4) | (writeMask << 8) | (ref << 16) | (inputMask << 24);
} }
void C3D_StencilOp(GPU_STENCILOP sfail, GPU_STENCILOP dfail, GPU_STENCILOP pass) void C3D_StencilOp(GPU_STENCILOP sfail, GPU_STENCILOP dfail, GPU_STENCILOP pass)