libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-26 09:41:15 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

Merge pull request #3736 from aliaspider/master

Browse Source 
(3DS) more fixes.
This commit is contained in:
Twinaphex 2016-10-04 21:50:15 +02:00 committed by GitHub
commit 49d520c5d5
4 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.ctr
View File

@ -56,6 +56,10 @@ else
HAVE_ZLIB = 1 HAVE_ZLIB = 1
HAVE_7ZIP = 1 HAVE_7ZIP = 1
HAVE_BUILTINZLIB = 1 HAVE_BUILTINZLIB = 1
HAVE_LIBRETRODB = 0
HAVE_ZARCH = 0
HAVE_MATERIALUI = 1
HAVE_XMB = 1
include Makefile.common include Makefile.common
BLACKLIST := BLACKLIST :=

1
ctr/ctr_debug.h
View File

@ -2,6 +2,7 @@
#define _CTR_DEBUG_H__ #define _CTR_DEBUG_H__
#include <stdio.h> #include <stdio.h>
#include <3ds/types.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

22
gfx/drivers/ctr_gfx.c
View File

@ -631,29 +631,29 @@ static bool ctr_frame(void* data, const void* frame,
ctr_check_3D_slider(ctr); ctr_check_3D_slider(ctr);
/* ARGB --> RGBA */ // /* ARGB --> RGBA */
if (ctr->rgb32) if (ctr->rgb32)
{ {
GPU_SetTexEnv(0, GPU_SetTexEnv(0,
GPU_TEVSOURCES(GPU_TEXTURE0, GPU_CONSTANT, 0), GPU_TEVSOURCES(GPU_TEXTURE0, GPU_CONSTANT, 0),
GPU_TEVSOURCES(GPU_PRIMARY_COLOR, GPU_PRIMARY_COLOR, 0), GPU_CONSTANT,
GPU_TEVOPERANDS(GPU_TEVOP_RGB_SRC_G, 0, 0), GPU_TEVOPERANDS(GPU_TEVOP_RGB_SRC_G, 0, 0),
GPU_TEVOPERANDS(0, 0, 0), 0,
GPU_MODULATE, GPU_MODULATE, GPU_MODULATE, GPU_REPLACE,
0x0000FF); 0xFF0000FF);
GPU_SetTexEnv(1, GPU_SetTexEnv(1,
GPU_TEVSOURCES(GPU_TEXTURE0, GPU_CONSTANT, GPU_PREVIOUS), GPU_TEVSOURCES(GPU_TEXTURE0, GPU_CONSTANT, GPU_PREVIOUS),
GPU_TEVSOURCES(GPU_PREVIOUS, GPU_PREVIOUS, 0), GPU_PREVIOUS,
GPU_TEVOPERANDS(GPU_TEVOP_RGB_SRC_B, 0, 0), GPU_TEVOPERANDS(GPU_TEVOP_RGB_SRC_B, 0, 0),
GPU_TEVOPERANDS(0, 0, 0), 0,
GPU_MULTIPLY_ADD, GPU_MODULATE, GPU_MULTIPLY_ADD, GPU_REPLACE,
0x00FF00); 0x00FF00);
GPU_SetTexEnv(2, GPU_SetTexEnv(2,
GPU_TEVSOURCES(GPU_TEXTURE0, GPU_CONSTANT, GPU_PREVIOUS), GPU_TEVSOURCES(GPU_TEXTURE0, GPU_CONSTANT, GPU_PREVIOUS),
GPU_TEVSOURCES(GPU_PREVIOUS, GPU_PREVIOUS, 0), GPU_PREVIOUS,
GPU_TEVOPERANDS(GPU_TEVOP_RGB_SRC_ALPHA, 0, 0), GPU_TEVOPERANDS(GPU_TEVOP_RGB_SRC_ALPHA, 0, 0),
GPU_TEVOPERANDS(0, 0, 0), 0,
GPU_MULTIPLY_ADD, GPU_MODULATE, GPU_MULTIPLY_ADD, GPU_REPLACE,
0xFF0000); 0xFF0000);
} }

3
libretro-common/file/retro_dirent.c
View File

@ -44,6 +44,9 @@ struct RDIR *retro_opendir(const char *name)
rdir->directory = FindFirstFile(path_buf, &rdir->entry); rdir->directory = FindFirstFile(path_buf, &rdir->entry);
#elif defined(VITA) || defined(PSP) #elif defined(VITA) || defined(PSP)
rdir->directory = sceIoDopen(name); rdir->directory = sceIoDopen(name);
#elif defined(_3DS)
rdir->directory = (name && *name)? opendir(name) : NULL;
rdir->entry = NULL;
#elif defined(__CELLOS_LV2__) #elif defined(__CELLOS_LV2__)
rdir->error = cellFsOpendir(name, &rdir->directory); rdir->error = cellFsOpendir(name, &rdir->directory);
#else #else