diff --git a/src/gapi/c3d.h b/src/gapi/c3d.h index 809ec1b..96b99e9 100644 --- a/src/gapi/c3d.h +++ b/src/gapi/c3d.h @@ -184,13 +184,8 @@ namespace GAPI { C3D_TexEnv *e = env; - GPU_TEVSRC texSrc = GPU_TEXTURE1; - if (src == compose_mirror) { - texSrc = GPU_TEXTURE0; - } - { // 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); if (pass == Core::passCompose) { C3D_TexEnvScale(e, C3D_RGB, GPU_TEVSCALE_2); @@ -557,11 +552,7 @@ namespace GAPI { void bind(int sampler) { if (opt & OPT_PROXY) return; - if (sampler == sEnvironment) { - sampler = 0; // PICA200 can fetch cubemap only from tex unit 0 - } else if (sampler == sDiffuse) { - sampler = 1; - } else { + if (sampler > 3) { return; } diff --git a/src/platform/3ds/compose_entity.v.pica b/src/platform/3ds/compose_entity.v.pica index 5fd51bf..6809033 100644 --- a/src/platform/3ds/compose_entity.v.pica +++ b/src/platform/3ds/compose_entity.v.pica @@ -41,7 +41,7 @@ ; out .out vPosition position -.out vTexCoord texcoord1 +.out vTexCoord texcoord0 .out vColor color .proc main diff --git a/src/platform/3ds/compose_room.v.pica b/src/platform/3ds/compose_room.v.pica index 65b2c8b..e270481 100644 --- a/src/platform/3ds/compose_room.v.pica +++ b/src/platform/3ds/compose_room.v.pica @@ -36,7 +36,7 @@ ; out .out vPosition position -.out vTexCoord texcoord1 +.out vTexCoord texcoord0 .out vColor color .proc main diff --git a/src/platform/3ds/compose_sprite.v.pica b/src/platform/3ds/compose_sprite.v.pica index a7962d2..7e803e6 100644 --- a/src/platform/3ds/compose_sprite.v.pica +++ b/src/platform/3ds/compose_sprite.v.pica @@ -43,7 +43,7 @@ ; out .out vPosition position -.out vTexCoord texcoord1 +.out vTexCoord texcoord0 .out vColor color .proc main diff --git a/src/platform/3ds/deploy.bat b/src/platform/3ds/deploy.bat index a64a83e..38c128a 100644 --- a/src/platform/3ds/deploy.bat +++ b/src/platform/3ds/deploy.bat @@ -1 +1 @@ -C:\devkitPro\tools\bin\3dslink.exe OpenLara.3dsx -a 192.168.1.68 \ No newline at end of file +C:\devkitPro\tools\bin\3dslink.exe OpenLara.3dsx -a 192.168.1.63 \ No newline at end of file diff --git a/src/platform/3ds/filter_upscale.v.pica b/src/platform/3ds/filter_upscale.v.pica index 5a09ad3..d4b7230 100644 --- a/src/platform/3ds/filter_upscale.v.pica +++ b/src/platform/3ds/filter_upscale.v.pica @@ -11,7 +11,7 @@ ; out .out vPosition position -.out vTexCoord texcoord1 +.out vTexCoord texcoord0 .out vColor color .proc main diff --git a/src/platform/3ds/gui.v.pica b/src/platform/3ds/gui.v.pica index 4656a47..08c1471 100644 --- a/src/platform/3ds/gui.v.pica +++ b/src/platform/3ds/gui.v.pica @@ -12,7 +12,7 @@ ; out .out vPosition position -.out vTexCoord texcoord1 +.out vTexCoord texcoord0 .out vColor color .proc main