mirror/openlara
1
0
Fork 0
mirror of https://github.com/XProger/OpenLara.git synced 2025-08-21 12:21:33 +02:00
Code Issues Releases Wiki Activity

3DS fix build

Browse Source
This commit is contained in:
Timur Gagiev
2020-11-07 05:47:48 +03:00
parent 1f6c3a771e
commit 8a5cc60873
7 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/gapi/c3d.h
View File

@@ -184,13 +184,8 @@ namespace GAPI {
C3D_TexEnv *e = env; C3D_TexEnv *e = env;
GPU_TEVSRC texSrc = GPU_TEXTURE1;
if (src == compose_mirror) {
texSrc = GPU_TEXTURE0;
}
{ // texture * vertex color { // texture * vertex color
C3D_TexEnvSrc(e, C3D_Both, texSrc, GPU_PRIMARY_COLOR, GPU_PRIMARY_COLOR); C3D_TexEnvSrc(e, C3D_Both, GPU_TEXTURE0, GPU_PRIMARY_COLOR, GPU_PRIMARY_COLOR);
C3D_TexEnvFunc(e, C3D_Both, GPU_MODULATE); C3D_TexEnvFunc(e, C3D_Both, GPU_MODULATE);
if (pass == Core::passCompose) { if (pass == Core::passCompose) {
C3D_TexEnvScale(e, C3D_RGB, GPU_TEVSCALE_2); C3D_TexEnvScale(e, C3D_RGB, GPU_TEVSCALE_2);
@@ -557,11 +552,7 @@ namespace GAPI {
void bind(int sampler) { void bind(int sampler) {
if (opt & OPT_PROXY) return; if (opt & OPT_PROXY) return;
if (sampler == sEnvironment) { if (sampler > 3) {
sampler = 0; // PICA200 can fetch cubemap only from tex unit 0
} else if (sampler == sDiffuse) {
sampler = 1;
} else {
return; return;
} }

2
src/platform/3ds/compose_entity.v.pica
View File

@@ -41,7 +41,7 @@
; out ; out
.out vPosition position .out vPosition position
.out vTexCoord texcoord1 .out vTexCoord texcoord0
.out vColor color .out vColor color
.proc main .proc main

2
src/platform/3ds/compose_room.v.pica
View File

@@ -36,7 +36,7 @@
; out ; out
.out vPosition position .out vPosition position
.out vTexCoord texcoord1 .out vTexCoord texcoord0
.out vColor color .out vColor color
.proc main .proc main

2
src/platform/3ds/compose_sprite.v.pica
View File

@@ -43,7 +43,7 @@
; out ; out
.out vPosition position .out vPosition position
.out vTexCoord texcoord1 .out vTexCoord texcoord0
.out vColor color .out vColor color
.proc main .proc main

2
src/platform/3ds/deploy.bat
View File

@@ -1 +1 @@
C:\devkitPro\tools\bin\3dslink.exe OpenLara.3dsx -a 192.168.1.68 C:\devkitPro\tools\bin\3dslink.exe OpenLara.3dsx -a 192.168.1.63

2
src/platform/3ds/filter_upscale.v.pica
View File

@@ -11,7 +11,7 @@
; out ; out
.out vPosition position .out vPosition position
.out vTexCoord texcoord1 .out vTexCoord texcoord0
.out vColor color .out vColor color
.proc main .proc main

2
src/platform/3ds/gui.v.pica
View File

@@ -12,7 +12,7 @@
; out ; out
.out vPosition position .out vPosition position
.out vTexCoord texcoord1 .out vTexCoord texcoord0
.out vColor color .out vColor color
.proc main .proc main