mirror of
https://github.com/libretro/RetroArch.git
synced 2024-11-23 07:59:42 +00:00
Squeeze extra blank lines with cat(1).
Example: find . -type f -iname '*.c' | while read -r i; do cat -s "$i" > "$i.new" mv "$i.new" "$i" done
This commit is contained in:
parent
93346fed6b
commit
bfc366decc
@ -107,7 +107,6 @@ MAKEROM_ARGS_COMMON = -rsf $(APP_RSF) -exefslogo -elf $(TARGET).elf -icon $(TARG
|
|||||||
INCDIRS := -I$(CTRULIB)/include
|
INCDIRS := -I$(CTRULIB)/include
|
||||||
LIBDIRS := -L. -L$(CTRULIB)/lib
|
LIBDIRS := -L. -L$(CTRULIB)/lib
|
||||||
|
|
||||||
|
|
||||||
ARCH := -march=armv6k -mtune=mpcore -mfloat-abi=hard -marm -mfpu=vfp -mtp=soft
|
ARCH := -march=armv6k -mtune=mpcore -mfloat-abi=hard -marm -mfpu=vfp -mtp=soft
|
||||||
|
|
||||||
CFLAGS += -mword-relocations \
|
CFLAGS += -mword-relocations \
|
||||||
@ -151,7 +150,6 @@ LDFLAGS += -specs=ctr/3dsx_custom.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
|
|||||||
|
|
||||||
CFLAGS += -std=gnu99 -ffast-math
|
CFLAGS += -std=gnu99 -ffast-math
|
||||||
|
|
||||||
|
|
||||||
LIBS := $(WHOLE_START) -lretro_ctr $(WHOLE_END) -lm
|
LIBS := $(WHOLE_START) -lretro_ctr $(WHOLE_END) -lm
|
||||||
|
|
||||||
ifeq ($(DEBUG), 1)
|
ifeq ($(DEBUG), 1)
|
||||||
@ -160,7 +158,6 @@ else
|
|||||||
LIBS += -lctru
|
LIBS += -lctru
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
||||||
ifeq ($(BUILD_3DSX), 1)
|
ifeq ($(BUILD_3DSX), 1)
|
||||||
TARGET_3DSX := $(TARGET).3dsx $(TARGET).smdh
|
TARGET_3DSX := $(TARGET).3dsx $(TARGET).smdh
|
||||||
endif
|
endif
|
||||||
@ -270,7 +267,6 @@ $(TARGET).3ds: $(TARGET).elf $(TARGET).bnr $(TARGET).icn $(APP_RSF)
|
|||||||
$(TARGET).cia: $(TARGET).elf $(TARGET).bnr $(TARGET).icn $(APP_RSF)
|
$(TARGET).cia: $(TARGET).elf $(TARGET).bnr $(TARGET).icn $(APP_RSF)
|
||||||
$(MAKEROM) -f cia -o $@ $(MAKEROM_ARGS_COMMON) -DAPP_ENCRYPTED=false
|
$(MAKEROM) -f cia -o $@ $(MAKEROM_ARGS_COMMON) -DAPP_ENCRYPTED=false
|
||||||
|
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f $(OBJ)
|
rm -f $(OBJ)
|
||||||
rm -f $(TARGET).3dsx
|
rm -f $(TARGET).3dsx
|
||||||
@ -285,4 +281,3 @@ clean:
|
|||||||
|
|
||||||
.PHONY: clean
|
.PHONY: clean
|
||||||
|
|
||||||
|
|
||||||
|
@ -94,10 +94,8 @@ LDFLAGS += -specs=ctr/3dsx_custom.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
|
|||||||
|
|
||||||
CFLAGS += -std=gnu99 -ffast-math
|
CFLAGS += -std=gnu99 -ffast-math
|
||||||
|
|
||||||
|
|
||||||
LIBS := -lctru -lm
|
LIBS := -lctru -lm
|
||||||
|
|
||||||
|
|
||||||
ifeq ($(BUILD_3DSX), 1)
|
ifeq ($(BUILD_3DSX), 1)
|
||||||
TARGET_3DSX := $(TARGET).3dsx $(TARGET).smdh
|
TARGET_3DSX := $(TARGET).3dsx $(TARGET).smdh
|
||||||
endif
|
endif
|
||||||
@ -221,4 +219,3 @@ clean:
|
|||||||
|
|
||||||
.PHONY: clean
|
.PHONY: clean
|
||||||
|
|
||||||
|
|
||||||
|
@ -1074,7 +1074,6 @@ overlays-checkout:
|
|||||||
$(GIT) clone git://github.com/libretro/common-overlays.git $(OVERLAY_DIR); \
|
$(GIT) clone git://github.com/libretro/common-overlays.git $(OVERLAY_DIR); \
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f $(EXT_TARGET)
|
rm -f $(EXT_TARGET)
|
||||||
rm -f $(EXT_INTER_TARGET)
|
rm -f $(EXT_INTER_TARGET)
|
||||||
|
@ -45,7 +45,6 @@ export CXX := $(PREFIX)g++
|
|||||||
export AR := $(PREFIX)ar
|
export AR := $(PREFIX)ar
|
||||||
export OBJCOPY := $(PREFIX)objcopy
|
export OBJCOPY := $(PREFIX)objcopy
|
||||||
|
|
||||||
|
|
||||||
ISVC=$(or $(VCBUILDHELPER_COMMAND),$(MSBUILDEXTENSIONSPATH32),$(MSBUILDEXTENSIONSPATH))
|
ISVC=$(or $(VCBUILDHELPER_COMMAND),$(MSBUILDEXTENSIONSPATH32),$(MSBUILDEXTENSIONSPATH))
|
||||||
|
|
||||||
#---------------------------------------------------------------------------------
|
#---------------------------------------------------------------------------------
|
||||||
@ -131,7 +130,6 @@ INCLUDES := $(DEFINCS) \
|
|||||||
|
|
||||||
MACHDEP := -DBIGENDIAN -DGEKKO -mcpu=750 -meabi -msdata=eabi -mhard-float -ffunction-sections -fdata-sections
|
MACHDEP := -DBIGENDIAN -DGEKKO -mcpu=750 -meabi -msdata=eabi -mhard-float -ffunction-sections -fdata-sections
|
||||||
|
|
||||||
|
|
||||||
ifeq ($(PLATFORM),wii)
|
ifeq ($(PLATFORM),wii)
|
||||||
MACHDEP += -DHW_RVL
|
MACHDEP += -DHW_RVL
|
||||||
endif
|
endif
|
||||||
@ -159,7 +157,6 @@ VPATH := $(LWIPDIR) \
|
|||||||
$(LIBWIIKEYB) \
|
$(LIBWIIKEYB) \
|
||||||
$(STUBSDIR)
|
$(STUBSDIR)
|
||||||
|
|
||||||
|
|
||||||
#---------------------------------------------------------------------------------
|
#---------------------------------------------------------------------------------
|
||||||
SOURCES_LWIP := $(LWIPDIR)/network.c \
|
SOURCES_LWIP := $(LWIPDIR)/network.c \
|
||||||
$(LWIPDIR)/netio.c \
|
$(LWIPDIR)/netio.c \
|
||||||
@ -264,7 +261,6 @@ SOURCES_OGC_ASM := $(OGCDIR)/cache_asm.S \
|
|||||||
$(OGCDIR)/system_asm.S \
|
$(OGCDIR)/system_asm.S \
|
||||||
$(OGCDIR)/video_asm.S
|
$(OGCDIR)/video_asm.S
|
||||||
|
|
||||||
|
|
||||||
ifneq ($(BUILD_LITE), 1)
|
ifneq ($(BUILD_LITE), 1)
|
||||||
SOURCES_OGC += $(OGCDIR)/dvd.c
|
SOURCES_OGC += $(OGCDIR)/dvd.c
|
||||||
endif
|
endif
|
||||||
|
@ -65,7 +65,6 @@ else
|
|||||||
#OBJ += frontend/drivers/platform_orbis.o
|
#OBJ += frontend/drivers/platform_orbis.o
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
||||||
ifeq ($(strip $(PS4SDK)),)
|
ifeq ($(strip $(PS4SDK)),)
|
||||||
$(error "Please set PS4SDK in your environment. export PS4SDK=<path to>ps4sdk")
|
$(error "Please set PS4SDK in your environment. export PS4SDK=<path to>ps4sdk")
|
||||||
endif
|
endif
|
||||||
@ -124,7 +123,6 @@ CXXFLAGS := $(CFLAGS)
|
|||||||
PS4_LIBS := -lps4link -ldebugnet -lorbisFile -lelfloader -lorbisKeyboard -lorbis2d -lpng -lz -lorbisGl -lorbisPad -lorbisAudio -lmod -lorbisAudio -lmod -lorbisFileBrowser -lorbisXbmFont -lSceNet_stub -lScePigletv2VSH_stub -lSceSystemService_stub -lSceUserService_stub -lScePad_stub -lSceAudioOut_stub -lSceIme_stub -lSceSysmodule_stub \
|
PS4_LIBS := -lps4link -ldebugnet -lorbisFile -lelfloader -lorbisKeyboard -lorbis2d -lpng -lz -lorbisGl -lorbisPad -lorbisAudio -lmod -lorbisAudio -lmod -lorbisFileBrowser -lorbisXbmFont -lSceNet_stub -lScePigletv2VSH_stub -lSceSystemService_stub -lSceUserService_stub -lScePad_stub -lSceAudioOut_stub -lSceIme_stub -lSceSysmodule_stub \
|
||||||
-lPs4_extension_kernel_call_standard -lPs4_extension_kernel_execute_dynlib_prepare_dlclose -lPs4_common_kernel -lPs4_common_user -lPs4_common_generic -lPs4LibCInternalAdaptive_stub -lPs4LibKernelAdaptive_stub -lSceLibcInternal_stub -lkernel_stub -lps4Kernel_stub -lPs4_base_stub_resolve_minimal -lPs4_base_kernel_dlsym_standard -lPs4_base_kernel_seek_elf_address_standard -lPs4_base_assembler_register_parameter_standard -lPs4_base_assembler_system_call_standard
|
-lPs4_extension_kernel_call_standard -lPs4_extension_kernel_execute_dynlib_prepare_dlclose -lPs4_common_kernel -lPs4_common_user -lPs4_common_generic -lPs4LibCInternalAdaptive_stub -lPs4LibKernelAdaptive_stub -lSceLibcInternal_stub -lkernel_stub -lps4Kernel_stub -lPs4_base_stub_resolve_minimal -lPs4_base_kernel_dlsym_standard -lPs4_base_kernel_seek_elf_address_standard -lPs4_base_assembler_register_parameter_standard -lPs4_base_assembler_system_call_standard
|
||||||
|
|
||||||
|
|
||||||
LIBS := $(WHOLE_START) -lretro_orbis $(WHOLE_END) $(PS4_LIBS)
|
LIBS := $(WHOLE_START) -lretro_orbis $(WHOLE_END) $(PS4_LIBS)
|
||||||
|
|
||||||
TARGETS := $(TARGET).elf
|
TARGETS := $(TARGET).elf
|
||||||
@ -132,7 +130,6 @@ TARGETS := $(TARGET).elf
|
|||||||
DEPFLAGS = -MT $@ -MMD -MP -MF $*.Tdepend
|
DEPFLAGS = -MT $@ -MMD -MP -MF $*.Tdepend
|
||||||
POSTCOMPILE = mv -f $*.Tdepend $*.depend
|
POSTCOMPILE = mv -f $*.Tdepend $*.depend
|
||||||
|
|
||||||
|
|
||||||
all: $(TARGETS)
|
all: $(TARGETS)
|
||||||
|
|
||||||
%.o: %.cpp
|
%.o: %.cpp
|
||||||
@ -145,7 +142,6 @@ all: $(TARGETS)
|
|||||||
$(CC) -c -o $@ $< $(CFLAGS) $(INCDIRS) $(DEPFLAGS)
|
$(CC) -c -o $@ $< $(CFLAGS) $(INCDIRS) $(DEPFLAGS)
|
||||||
$(POSTCOMPILE)
|
$(POSTCOMPILE)
|
||||||
|
|
||||||
|
|
||||||
%.o: %.S
|
%.o: %.S
|
||||||
%.o: %.S %.depend
|
%.o: %.S %.depend
|
||||||
$(CC) -c -o $@ $< $(ASFLAGS) $(INCDIRS) $(DEPFLAGS)
|
$(CC) -c -o $@ $< $(ASFLAGS) $(INCDIRS) $(DEPFLAGS)
|
||||||
|
@ -27,7 +27,6 @@ ifeq ($(MUTE_WARNINGS), 1)
|
|||||||
DISABLE_WARNINGS := -Wno-sign-compare -Wno-unused -Wno-parentheses
|
DISABLE_WARNINGS := -Wno-sign-compare -Wno-unused -Wno-parentheses
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
||||||
INCDIR = -I$(PS2DEV)/gsKit/include -I$(PS2SDK)/ports/include
|
INCDIR = -I$(PS2DEV)/gsKit/include -I$(PS2SDK)/ports/include
|
||||||
INCDIR += -Ips2 -Ips2/include -Ilibretro-common/include
|
INCDIR += -Ips2 -Ips2/include -Ilibretro-common/include
|
||||||
INCDIR += -Ideps -Ideps/stb -Ideps/libz -Ideps/7zip -Ideps/pthreads -Ideps/pthreads/platform/ps2 -Ideps/pthreads/platform/helper
|
INCDIR += -Ideps -Ideps/stb -Ideps/libz -Ideps/7zip -Ideps/pthreads -Ideps/pthreads/platform/ps2 -Ideps/pthreads/platform/helper
|
||||||
|
@ -49,7 +49,6 @@ endif
|
|||||||
|
|
||||||
CFLAGS += $(RARCH_DEFINES)
|
CFLAGS += $(RARCH_DEFINES)
|
||||||
|
|
||||||
|
|
||||||
EXTRA_TARGETS = EBOOT.PBP
|
EXTRA_TARGETS = EBOOT.PBP
|
||||||
PSP_EBOOT_TITLE = RetroArch PSP1
|
PSP_EBOOT_TITLE = RetroArch PSP1
|
||||||
|
|
||||||
|
@ -127,7 +127,6 @@ TARGETS := $(TARGET).vpk
|
|||||||
DEPFLAGS = -MT $@ -MMD -MP -MF $*.Tdepend
|
DEPFLAGS = -MT $@ -MMD -MP -MF $*.Tdepend
|
||||||
POSTCOMPILE = mv -f $*.Tdepend $*.depend
|
POSTCOMPILE = mv -f $*.Tdepend $*.depend
|
||||||
|
|
||||||
|
|
||||||
all: $(TARGETS)
|
all: $(TARGETS)
|
||||||
|
|
||||||
%.o: %.cpp
|
%.o: %.cpp
|
||||||
@ -140,7 +139,6 @@ all: $(TARGETS)
|
|||||||
$(CC) -c -o $@ $< $(CFLAGS) $(INCDIRS) $(DEPFLAGS)
|
$(CC) -c -o $@ $< $(CFLAGS) $(INCDIRS) $(DEPFLAGS)
|
||||||
$(POSTCOMPILE)
|
$(POSTCOMPILE)
|
||||||
|
|
||||||
|
|
||||||
%.o: %.S
|
%.o: %.S
|
||||||
%.o: %.S %.depend
|
%.o: %.S %.depend
|
||||||
$(CC) -c -o $@ $< $(ASFLAGS) $(INCDIRS) $(DEPFLAGS)
|
$(CC) -c -o $@ $< $(ASFLAGS) $(INCDIRS) $(DEPFLAGS)
|
||||||
|
@ -242,7 +242,6 @@ ifneq ($(WANT_IOSUHAX), 1)
|
|||||||
LIBS += -liosuhax
|
LIBS += -liosuhax
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
||||||
RPX_OBJ = $(BUILD_DIR)/wiiu/system/stubs_rpl.o
|
RPX_OBJ = $(BUILD_DIR)/wiiu/system/stubs_rpl.o
|
||||||
HBL_ELF_OBJ = $(BUILD_DIR)/wiiu/system/dynamic.o $(BUILD_DIR)/wiiu/system/stubs_elf.o
|
HBL_ELF_OBJ = $(BUILD_DIR)/wiiu/system/dynamic.o $(BUILD_DIR)/wiiu/system/stubs_elf.o
|
||||||
|
|
||||||
@ -264,13 +263,11 @@ endif
|
|||||||
|
|
||||||
DEPFLAGS = -MT $@ -MMD -MP -MF $(BUILD_DIR)/$*.depend
|
DEPFLAGS = -MT $@ -MMD -MP -MF $(BUILD_DIR)/$*.depend
|
||||||
|
|
||||||
|
|
||||||
all: $(TARGETS)
|
all: $(TARGETS)
|
||||||
|
|
||||||
%: $(BUILD_DIR)/%
|
%: $(BUILD_DIR)/%
|
||||||
cp $< $@
|
cp $< $@
|
||||||
|
|
||||||
|
|
||||||
$(BUILD_DIR)/%.o: %.cpp %.depend
|
$(BUILD_DIR)/%.o: %.cpp %.depend
|
||||||
@$(if $(Q), echo CXX $<,)
|
@$(if $(Q), echo CXX $<,)
|
||||||
@mkdir -p $(dir $@)
|
@mkdir -p $(dir $@)
|
||||||
|
@ -397,7 +397,6 @@ static void audio_driver_mixer_init(unsigned out_rate)
|
|||||||
audio_mixer_init(out_rate);
|
audio_mixer_init(out_rate);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static bool audio_driver_init_internal(bool audio_cb_inited)
|
static bool audio_driver_init_internal(bool audio_cb_inited)
|
||||||
{
|
{
|
||||||
unsigned new_rate = 0;
|
unsigned new_rate = 0;
|
||||||
@ -636,7 +635,6 @@ static void audio_driver_flush(const int16_t *data, size_t samples)
|
|||||||
src_data.data_in = audio_driver_input_data;
|
src_data.data_in = audio_driver_input_data;
|
||||||
src_data.input_frames = samples >> 1;
|
src_data.input_frames = samples >> 1;
|
||||||
|
|
||||||
|
|
||||||
if (audio_driver_dsp)
|
if (audio_driver_dsp)
|
||||||
{
|
{
|
||||||
struct retro_dsp_data dsp_data;
|
struct retro_dsp_data dsp_data;
|
||||||
@ -1504,7 +1502,6 @@ error:
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool audio_driver_stop(void)
|
bool audio_driver_stop(void)
|
||||||
{
|
{
|
||||||
if (!current_audio || !current_audio->stop
|
if (!current_audio || !current_audio->stop
|
||||||
@ -1594,7 +1591,6 @@ void audio_set_bool(enum audio_action action, bool val)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void audio_set_float(enum audio_action action, float val)
|
void audio_set_float(enum audio_action action, float val)
|
||||||
{
|
{
|
||||||
switch (action)
|
switch (action)
|
||||||
|
@ -219,7 +219,6 @@ static int check_pcm_status(void *data, int channel_type)
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static ssize_t alsa_qsa_write(void *data, const void *buf, size_t size)
|
static ssize_t alsa_qsa_write(void *data, const void *buf, size_t size)
|
||||||
{
|
{
|
||||||
alsa_t *alsa = (alsa_t*)data;
|
alsa_t *alsa = (alsa_t*)data;
|
||||||
@ -328,7 +327,6 @@ static void alsa_qsa_set_nonblock_state(void *data, bool state)
|
|||||||
alsa->nonblock = state;
|
alsa->nonblock = state;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static bool alsa_qsa_use_float(void *data)
|
static bool alsa_qsa_use_float(void *data)
|
||||||
{
|
{
|
||||||
alsa_t *alsa = (alsa_t*)data;
|
alsa_t *alsa = (alsa_t*)data;
|
||||||
|
@ -15,7 +15,6 @@
|
|||||||
*/
|
*/
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
|
|
||||||
#if TARGET_OS_IPHONE
|
#if TARGET_OS_IPHONE
|
||||||
#include <AudioToolbox/AudioToolbox.h>
|
#include <AudioToolbox/AudioToolbox.h>
|
||||||
#else
|
#else
|
||||||
|
@ -56,7 +56,6 @@ static void ctr_csnd_audio_update_playpos(ctr_csnd_audio_t* ctr)
|
|||||||
ctr->cpu_ticks_last += samples_played * CTR_CSND_CPU_TICKS_PER_SAMPLE;
|
ctr->cpu_ticks_last += samples_played * CTR_CSND_CPU_TICKS_PER_SAMPLE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
Result csndPlaySound_custom(int chn, u32 flags, float vol, float pan,
|
Result csndPlaySound_custom(int chn, u32 flags, float vol, float pan,
|
||||||
void* data0, void* data1, u32 size)
|
void* data0, void* data1, u32 size)
|
||||||
{
|
{
|
||||||
@ -289,7 +288,6 @@ static size_t ctr_csnd_audio_buffer_size(void *data)
|
|||||||
return CTR_CSND_AUDIO_COUNT;
|
return CTR_CSND_AUDIO_COUNT;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
audio_driver_t audio_ctr_csnd = {
|
audio_driver_t audio_ctr_csnd = {
|
||||||
ctr_csnd_audio_init,
|
ctr_csnd_audio_init,
|
||||||
ctr_csnd_audio_write,
|
ctr_csnd_audio_write,
|
||||||
|
@ -195,7 +195,6 @@ static size_t ctr_dsp_audio_buffer_size(void *data)
|
|||||||
return CTR_DSP_AUDIO_COUNT;
|
return CTR_DSP_AUDIO_COUNT;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
audio_driver_t audio_ctr_dsp = {
|
audio_driver_t audio_ctr_dsp = {
|
||||||
ctr_dsp_audio_init,
|
ctr_dsp_audio_init,
|
||||||
ctr_dsp_audio_write,
|
ctr_dsp_audio_write,
|
||||||
|
@ -51,7 +51,6 @@
|
|||||||
#pragma comment(lib, "dxguid")
|
#pragma comment(lib, "dxguid")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
typedef struct dsound
|
typedef struct dsound
|
||||||
{
|
{
|
||||||
LPDIRECTSOUND ds;
|
LPDIRECTSOUND ds;
|
||||||
@ -174,7 +173,6 @@ static DWORD CALLBACK dsound_thread(PVOID data)
|
|||||||
/* No space to write, or we don't have data in our fifo,
|
/* No space to write, or we don't have data in our fifo,
|
||||||
* but we can wait some time before it underruns ... */
|
* but we can wait some time before it underruns ... */
|
||||||
|
|
||||||
|
|
||||||
/* We could opt for using the notification interface,
|
/* We could opt for using the notification interface,
|
||||||
* but it is not guaranteed to work, so use high
|
* but it is not guaranteed to work, so use high
|
||||||
* priority sleeping patterns.
|
* priority sleeping patterns.
|
||||||
|
@ -232,7 +232,6 @@ static bool sl_start(void *data, bool is_shutdown)
|
|||||||
return sl->is_paused ? false : true;
|
return sl->is_paused ? false : true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static ssize_t sl_write(void *data, const void *buf_, size_t size)
|
static ssize_t sl_write(void *data, const void *buf_, size_t size)
|
||||||
{
|
{
|
||||||
sl_t *sl = (sl_t*)data;
|
sl_t *sl = (sl_t*)data;
|
||||||
|
@ -43,7 +43,6 @@ static u8 audioThreadStack[4 * 1024] __attribute__ ((aligned(16)));
|
|||||||
#define AUDIO_BITS 16
|
#define AUDIO_BITS 16
|
||||||
#define AUDIO_PRIORITY 0x7F /* LOWER VALUE GRATHER PRIORITY*/
|
#define AUDIO_PRIORITY 0x7F /* LOWER VALUE GRATHER PRIORITY*/
|
||||||
|
|
||||||
|
|
||||||
static void audioMainLoop(void *data)
|
static void audioMainLoop(void *data)
|
||||||
{
|
{
|
||||||
char out_tmp[AUDIO_OUT_BUFFER];
|
char out_tmp[AUDIO_OUT_BUFFER];
|
||||||
@ -67,7 +66,6 @@ static void audioMainLoop(void *data)
|
|||||||
ExitDeleteThread();
|
ExitDeleteThread();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void audioCreateThread(ps2_audio_t *ps2)
|
static void audioCreateThread(ps2_audio_t *ps2)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
|
@ -228,7 +228,6 @@ static bool psp_audio_alive(void *data)
|
|||||||
return psp->running;
|
return psp->running;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static bool psp_audio_stop(void *data)
|
static bool psp_audio_stop(void *data)
|
||||||
{
|
{
|
||||||
psp_audio_t* psp = (psp_audio_t*)data;
|
psp_audio_t* psp = (psp_audio_t*)data;
|
||||||
@ -294,7 +293,6 @@ static size_t psp_buffer_size(void *data)
|
|||||||
return AUDIO_BUFFER_SIZE /** sizeof(uint32_t)*/;
|
return AUDIO_BUFFER_SIZE /** sizeof(uint32_t)*/;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
audio_driver_t audio_psp = {
|
audio_driver_t audio_psp = {
|
||||||
psp_audio_init,
|
psp_audio_init,
|
||||||
psp_audio_write,
|
psp_audio_write,
|
||||||
|
@ -80,7 +80,6 @@ static void mainLoop(void* data)
|
|||||||
|
|
||||||
RARCH_LOG("[Audio]: start mainLoop cpu %u tid %u\n", svcGetCurrentProcessorNumber(), swa->thread.handle);
|
RARCH_LOG("[Audio]: start mainLoop cpu %u tid %u\n", svcGetCurrentProcessorNumber(), swa->thread.handle);
|
||||||
|
|
||||||
|
|
||||||
while (swa->running)
|
while (swa->running)
|
||||||
{
|
{
|
||||||
size_t buf_avail, avail, to_write;
|
size_t buf_avail, avail, to_write;
|
||||||
|
@ -296,7 +296,6 @@
|
|||||||
#define SNDRV_PCM_MMAP_OFFSET_STATUS 0x80000000
|
#define SNDRV_PCM_MMAP_OFFSET_STATUS 0x80000000
|
||||||
#define SNDRV_PCM_MMAP_OFFSET_CONTROL 0x81000000
|
#define SNDRV_PCM_MMAP_OFFSET_CONTROL 0x81000000
|
||||||
|
|
||||||
|
|
||||||
/** Audio sample format of a PCM.
|
/** Audio sample format of a PCM.
|
||||||
* The first letter specifiers whether the sample is signed or unsigned.
|
* The first letter specifiers whether the sample is signed or unsigned.
|
||||||
* The letter 'S' means signed. The letter 'U' means unsigned.
|
* The letter 'S' means signed. The letter 'U' means unsigned.
|
||||||
|
@ -318,7 +318,6 @@ static size_t ax_audio_buffer_size(void* data)
|
|||||||
return AX_AUDIO_COUNT;
|
return AX_AUDIO_COUNT;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
audio_driver_t audio_ax =
|
audio_driver_t audio_ax =
|
||||||
{
|
{
|
||||||
ax_audio_init,
|
ax_audio_init,
|
||||||
|
@ -169,7 +169,6 @@ typedef OPAQUE IXAudio2EngineCallback IXAudio2EngineCallback;
|
|||||||
typedef OPAQUE IXAudio2SubmixVoice IXAudio2SubmixVoice;
|
typedef OPAQUE IXAudio2SubmixVoice IXAudio2SubmixVoice;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
typedef struct XAUDIO2_BUFFER
|
typedef struct XAUDIO2_BUFFER
|
||||||
{
|
{
|
||||||
UINT32 Flags;
|
UINT32 Flags;
|
||||||
|
@ -55,7 +55,6 @@ typedef struct rarch_CC_resampler
|
|||||||
void (*process)(void *re, struct resampler_data *data);
|
void (*process)(void *re, struct resampler_data *data);
|
||||||
} rarch_CC_resampler_t;
|
} rarch_CC_resampler_t;
|
||||||
|
|
||||||
|
|
||||||
#ifdef _MIPS_ARCH_ALLEGREX
|
#ifdef _MIPS_ARCH_ALLEGREX
|
||||||
static void resampler_CC_process(void *re_, struct resampler_data *data)
|
static void resampler_CC_process(void *re_, struct resampler_data *data)
|
||||||
{
|
{
|
||||||
@ -115,7 +114,6 @@ static void resampler_CC_process(void *re_, struct resampler_data *data)
|
|||||||
|
|
||||||
"vadd.q c720, c720, c620 \n"
|
"vadd.q c720, c720, c620 \n"
|
||||||
|
|
||||||
|
|
||||||
"vadd.s s730, s730, s730[1] \n"
|
"vadd.s s730, s730, s730[1] \n"
|
||||||
"mfv %0, s730 \n"
|
"mfv %0, s730 \n"
|
||||||
|
|
||||||
@ -216,7 +214,6 @@ static void resampler_CC_downsample(void *re_, struct resampler_data *data)
|
|||||||
vec_ww1 = _mm_mul_ps(vec_w1, vec_w1);
|
vec_ww1 = _mm_mul_ps(vec_w1, vec_w1);
|
||||||
vec_ww2 = _mm_mul_ps(vec_w2, vec_w2);
|
vec_ww2 = _mm_mul_ps(vec_w2, vec_w2);
|
||||||
|
|
||||||
|
|
||||||
vec_ww1 = _mm_mul_ps(vec_ww1, _mm_sub_ps(_mm_set_ps1(3.0),vec_ww1));
|
vec_ww1 = _mm_mul_ps(vec_ww1, _mm_sub_ps(_mm_set_ps1(3.0),vec_ww1));
|
||||||
vec_ww2 = _mm_mul_ps(vec_ww2, _mm_sub_ps(_mm_set_ps1(3.0),vec_ww2));
|
vec_ww2 = _mm_mul_ps(vec_ww2, _mm_sub_ps(_mm_set_ps1(3.0),vec_ww2));
|
||||||
|
|
||||||
@ -307,7 +304,6 @@ static void resampler_CC_upsample(void *re_, struct resampler_data *data)
|
|||||||
vec_ww1 = _mm_mul_ps(vec_w1, vec_w1);
|
vec_ww1 = _mm_mul_ps(vec_w1, vec_w1);
|
||||||
vec_ww2 = _mm_mul_ps(vec_w2, vec_w2);
|
vec_ww2 = _mm_mul_ps(vec_w2, vec_w2);
|
||||||
|
|
||||||
|
|
||||||
vec_ww1 = _mm_mul_ps(vec_ww1,_mm_sub_ps(_mm_set_ps1(3.0),vec_ww1));
|
vec_ww1 = _mm_mul_ps(vec_ww1,_mm_sub_ps(_mm_set_ps1(3.0),vec_ww1));
|
||||||
vec_ww2 = _mm_mul_ps(vec_ww2,_mm_sub_ps(_mm_set_ps1(3.0),vec_ww2));
|
vec_ww2 = _mm_mul_ps(vec_ww2,_mm_sub_ps(_mm_set_ps1(3.0),vec_ww2));
|
||||||
|
|
||||||
@ -349,7 +345,6 @@ static void resampler_CC_upsample(void *re_, struct resampler_data *data)
|
|||||||
data->output_frames = outp - (audio_frame_float_t*)data->data_out;
|
data->output_frames = outp - (audio_frame_float_t*)data->data_out;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#elif defined (__ARM_NEON__) && !defined(DONT_WANT_ARM_OPTIMIZATIONS)
|
#elif defined (__ARM_NEON__) && !defined(DONT_WANT_ARM_OPTIMIZATIONS)
|
||||||
|
|
||||||
#define CC_RESAMPLER_IDENT "NEON"
|
#define CC_RESAMPLER_IDENT "NEON"
|
||||||
@ -492,7 +487,6 @@ static void resampler_CC_process(void *re_, struct resampler_data *data)
|
|||||||
re->process(re_, data);
|
re->process(re_, data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void *resampler_CC_init(const struct resampler_config *config,
|
static void *resampler_CC_init(const struct resampler_config *config,
|
||||||
double bandwidth_mod,
|
double bandwidth_mod,
|
||||||
enum resampler_quality quality,
|
enum resampler_quality quality,
|
||||||
|
@ -46,7 +46,6 @@
|
|||||||
#define NETWORK_COMPAT_HEADERS 1
|
#define NETWORK_COMPAT_HEADERS 1
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
#ifdef NETWORK_COMPAT_HEADERS
|
#ifdef NETWORK_COMPAT_HEADERS
|
||||||
#include <sys/socket.h>
|
#include <sys/socket.h>
|
||||||
#include <netdb.h>
|
#include <netdb.h>
|
||||||
@ -158,7 +157,6 @@ static int rsnd_poll(struct pollfd *fd, int numfd, int timeout);
|
|||||||
static void rsnd_cb_thread(void *thread_data);
|
static void rsnd_cb_thread(void *thread_data);
|
||||||
static void rsnd_thread(void *thread_data);
|
static void rsnd_thread(void *thread_data);
|
||||||
|
|
||||||
|
|
||||||
/* Determine whether we're running big- or little endian */
|
/* Determine whether we're running big- or little endian */
|
||||||
static INLINE int rsnd_is_little_endian(void)
|
static INLINE int rsnd_is_little_endian(void)
|
||||||
{
|
{
|
||||||
@ -242,7 +240,6 @@ static int rsnd_connect_server( rsound_t *rd )
|
|||||||
|
|
||||||
rd->conn_type = RSD_CONN_TCP;
|
rd->conn_type = RSD_CONN_TCP;
|
||||||
|
|
||||||
|
|
||||||
rd->conn.socket = net_socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
|
rd->conn.socket = net_socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
|
||||||
if ( rd->conn.socket < 0 )
|
if ( rd->conn.socket < 0 )
|
||||||
goto error;
|
goto error;
|
||||||
@ -312,7 +309,6 @@ static int rsnd_send_header_info(rsound_t *rd)
|
|||||||
#define FRAMESIZE 34
|
#define FRAMESIZE 34
|
||||||
#define FORMAT 42
|
#define FORMAT 42
|
||||||
|
|
||||||
|
|
||||||
uint32_t temp_rate = rd->rate;
|
uint32_t temp_rate = rd->rate;
|
||||||
uint16_t temp_channels = rd->channels;
|
uint16_t temp_channels = rd->channels;
|
||||||
|
|
||||||
@ -980,7 +976,6 @@ static int rsnd_close_ctl(rsound_t *rd)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Sends delay info request to server on the ctl socket. This code section isn't critical, and will work if it works.
|
// Sends delay info request to server on the ctl socket. This code section isn't critical, and will work if it works.
|
||||||
// It will never block.
|
// It will never block.
|
||||||
static int rsnd_send_info_query(rsound_t *rd)
|
static int rsnd_send_info_query(rsound_t *rd)
|
||||||
@ -1296,7 +1291,6 @@ static int rsnd_reset(rsound_t *rd)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
int rsd_stop(rsound_t *rd)
|
int rsd_stop(rsound_t *rd)
|
||||||
{
|
{
|
||||||
retro_assert(rd != NULL);
|
retro_assert(rd != NULL);
|
||||||
@ -1403,7 +1397,6 @@ int rsd_exec(rsound_t *rsound)
|
|||||||
return fd;
|
return fd;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/* ioctl()-ish param setting :D */
|
/* ioctl()-ish param setting :D */
|
||||||
int rsd_set_param(rsound_t *rd, enum rsd_settings option, void* param)
|
int rsd_set_param(rsound_t *rd, enum rsd_settings option, void* param)
|
||||||
{
|
{
|
||||||
@ -1493,7 +1486,6 @@ void rsd_delay_wait(rsound_t *rd)
|
|||||||
/* Latency of stream in ms */
|
/* Latency of stream in ms */
|
||||||
int latency_ms = rsd_delay_ms(rd);
|
int latency_ms = rsd_delay_ms(rd);
|
||||||
|
|
||||||
|
|
||||||
/* Should we sleep for a while to keep the latency low? */
|
/* Should we sleep for a while to keep the latency low? */
|
||||||
if ( rd->max_latency < latency_ms )
|
if ( rd->max_latency < latency_ms )
|
||||||
{
|
{
|
||||||
|
@ -46,7 +46,6 @@ void _init_vita_heap(void) {
|
|||||||
_newlib_vm_memblock = 0;
|
_newlib_vm_memblock = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Create a mutex to use inside _sbrk_r
|
// Create a mutex to use inside _sbrk_r
|
||||||
if (sceKernelCreateLwMutex((struct SceKernelLwMutexWork*)_newlib_sbrk_mutex, "sbrk mutex", 0, 0, 0) < 0) {
|
if (sceKernelCreateLwMutex((struct SceKernelLwMutexWork*)_newlib_sbrk_mutex, "sbrk mutex", 0, 0, 0) < 0) {
|
||||||
goto failure;
|
goto failure;
|
||||||
|
@ -2622,8 +2622,6 @@ static int cheevos_iterate(coro_t *coro)
|
|||||||
|
|
||||||
CORO_ENTER();
|
CORO_ENTER();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
cheevos_locals.addrs_patched = false;
|
cheevos_locals.addrs_patched = false;
|
||||||
|
|
||||||
coro->settings = config_get_ptr();
|
coro->settings = config_get_ptr();
|
||||||
|
@ -244,8 +244,6 @@ static const struct cmd_map map[] = {
|
|||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
bool command_set_shader(const char *arg)
|
bool command_set_shader(const char *arg)
|
||||||
{
|
{
|
||||||
char msg[256];
|
char msg[256];
|
||||||
@ -273,7 +271,6 @@ bool command_set_shader(const char *arg)
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#if defined(HAVE_COMMAND) && defined(HAVE_CHEEVOS)
|
#if defined(HAVE_COMMAND) && defined(HAVE_CHEEVOS)
|
||||||
#define SMY_CMD_STR "READ_CORE_RAM"
|
#define SMY_CMD_STR "READ_CORE_RAM"
|
||||||
static bool command_read_ram(const char *arg)
|
static bool command_read_ram(const char *arg)
|
||||||
@ -426,7 +423,6 @@ static bool command_network_init(command_t *handle, uint16_t port)
|
|||||||
msg_hash_to_str(MSG_BRINGING_UP_COMMAND_INTERFACE_ON_PORT),
|
msg_hash_to_str(MSG_BRINGING_UP_COMMAND_INTERFACE_ON_PORT),
|
||||||
(unsigned short)port);
|
(unsigned short)port);
|
||||||
|
|
||||||
|
|
||||||
if (fd < 0)
|
if (fd < 0)
|
||||||
goto error;
|
goto error;
|
||||||
|
|
||||||
@ -1150,7 +1146,6 @@ static void command_event_init_cheats(void)
|
|||||||
cheat_manager_alloc_if_empty() ;
|
cheat_manager_alloc_if_empty() ;
|
||||||
cheat_manager_load_game_specific_cheats() ;
|
cheat_manager_load_game_specific_cheats() ;
|
||||||
|
|
||||||
|
|
||||||
if (settings != NULL && settings->bools.apply_cheats_after_load)
|
if (settings != NULL && settings->bools.apply_cheats_after_load)
|
||||||
cheat_manager_apply_cheats();
|
cheat_manager_apply_cheats();
|
||||||
}
|
}
|
||||||
@ -1347,7 +1342,6 @@ static bool command_event_init_core(enum rarch_core_type *data)
|
|||||||
if(settings->bools.auto_shaders_enable)
|
if(settings->bools.auto_shaders_enable)
|
||||||
config_load_shader_preset();
|
config_load_shader_preset();
|
||||||
|
|
||||||
|
|
||||||
/* reset video format to libretro's default */
|
/* reset video format to libretro's default */
|
||||||
video_driver_set_pixel_format(RETRO_PIXEL_FORMAT_0RGB1555);
|
video_driver_set_pixel_format(RETRO_PIXEL_FORMAT_0RGB1555);
|
||||||
|
|
||||||
@ -1370,7 +1364,6 @@ static bool command_event_init_core(enum rarch_core_type *data)
|
|||||||
if (!core_load(settings->uints.input_poll_type_behavior))
|
if (!core_load(settings->uints.input_poll_type_behavior))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
|
||||||
rarch_ctl(RARCH_CTL_SET_FRAME_LIMIT, NULL);
|
rarch_ctl(RARCH_CTL_SET_FRAME_LIMIT, NULL);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -1634,7 +1627,6 @@ static void command_event_save_current_config(enum override_type type)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if (!string_is_empty(msg))
|
if (!string_is_empty(msg))
|
||||||
runloop_msg_queue_push(msg, 1, 180, true);
|
runloop_msg_queue_push(msg, 1, 180, true);
|
||||||
}
|
}
|
||||||
|
@ -962,7 +962,6 @@ const char *config_get_default_joypad(void)
|
|||||||
return "null";
|
return "null";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* config_get_default_camera:
|
* config_get_default_camera:
|
||||||
*
|
*
|
||||||
@ -2267,7 +2266,6 @@ static config_file_t *open_default_config_file(void)
|
|||||||
/* Try to create a new config file. */
|
/* Try to create a new config file. */
|
||||||
conf = config_file_new(NULL);
|
conf = config_file_new(NULL);
|
||||||
|
|
||||||
|
|
||||||
if (conf)
|
if (conf)
|
||||||
{
|
{
|
||||||
/* Since this is a clean config file, we can
|
/* Since this is a clean config file, we can
|
||||||
@ -2633,7 +2631,6 @@ static void config_get_hex_base(config_file_t *conf,
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* config_load:
|
* config_load:
|
||||||
* @path : path to be read from.
|
* @path : path to be read from.
|
||||||
@ -2840,7 +2837,6 @@ static bool config_load_file(const char *path, bool set_defaults,
|
|||||||
CONFIG_GET_INT_BASE(conf, settings, uints.led_map[i], buf);
|
CONFIG_GET_INT_BASE(conf, settings, uints.led_map[i], buf);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/* Hexadecimal settings */
|
/* Hexadecimal settings */
|
||||||
|
|
||||||
if (config_get_hex(conf, "video_message_color", &msg_color))
|
if (config_get_hex(conf, "video_message_color", &msg_color))
|
||||||
@ -3024,7 +3020,6 @@ static bool config_load_file(const char *path, bool set_defaults,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if (!string_is_empty(settings->paths.directory_screenshot))
|
if (!string_is_empty(settings->paths.directory_screenshot))
|
||||||
{
|
{
|
||||||
if (string_is_equal(settings->paths.directory_screenshot, "default"))
|
if (string_is_equal(settings->paths.directory_screenshot, "default"))
|
||||||
@ -3091,7 +3086,6 @@ static bool config_load_file(const char *path, bool set_defaults,
|
|||||||
if (settings->floats.fastforward_ratio < 0.0f)
|
if (settings->floats.fastforward_ratio < 0.0f)
|
||||||
configuration_set_float(settings, settings->floats.fastforward_ratio, 0.0f);
|
configuration_set_float(settings, settings->floats.fastforward_ratio, 0.0f);
|
||||||
|
|
||||||
|
|
||||||
#ifdef HAVE_LAKKA
|
#ifdef HAVE_LAKKA
|
||||||
settings->bools.ssh_enable = filestream_exists(LAKKA_SSH_PATH);
|
settings->bools.ssh_enable = filestream_exists(LAKKA_SSH_PATH);
|
||||||
settings->bools.samba_enable = filestream_exists(LAKKA_SAMBA_PATH);
|
settings->bools.samba_enable = filestream_exists(LAKKA_SAMBA_PATH);
|
||||||
@ -3187,7 +3181,6 @@ static bool config_load_file(const char *path, bool set_defaults,
|
|||||||
|
|
||||||
ret = true;
|
ret = true;
|
||||||
|
|
||||||
|
|
||||||
end:
|
end:
|
||||||
if (conf)
|
if (conf)
|
||||||
config_file_free(conf);
|
config_file_free(conf);
|
||||||
@ -3498,7 +3491,6 @@ bool config_load_remap(void)
|
|||||||
malloc(PATH_MAX_LENGTH * sizeof(char));
|
malloc(PATH_MAX_LENGTH * sizeof(char));
|
||||||
remap_directory[0] = core_path[0] = game_path[0] = '\0';
|
remap_directory[0] = core_path[0] = game_path[0] = '\0';
|
||||||
|
|
||||||
|
|
||||||
strlcpy(remap_directory,
|
strlcpy(remap_directory,
|
||||||
settings->paths.directory_input_remapping,
|
settings->paths.directory_input_remapping,
|
||||||
path_size);
|
path_size);
|
||||||
@ -3565,7 +3557,6 @@ bool config_load_remap(void)
|
|||||||
input_remapping_set_defaults(false);
|
input_remapping_set_defaults(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/* Create a new config file from core_path */
|
/* Create a new config file from core_path */
|
||||||
new_conf = config_file_new(core_path);
|
new_conf = config_file_new(core_path);
|
||||||
|
|
||||||
@ -3791,8 +3782,6 @@ static void parse_config_file(void)
|
|||||||
path_get(RARCH_PATH_CONFIG));
|
path_get(RARCH_PATH_CONFIG));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
static void save_keybind_key(config_file_t *conf, const char *prefix,
|
static void save_keybind_key(config_file_t *conf, const char *prefix,
|
||||||
const char *base, const struct retro_keybind *bind)
|
const char *base, const struct retro_keybind *bind)
|
||||||
{
|
{
|
||||||
@ -4052,7 +4041,6 @@ static bool config_save_keybinds_file(const char *path)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* config_save_autoconf_profile:
|
* config_save_autoconf_profile:
|
||||||
* @path : Path that shall be written to.
|
* @path : Path that shall be written to.
|
||||||
@ -4170,7 +4158,6 @@ error:
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* config_save_file:
|
* config_save_file:
|
||||||
* @path : Path that shall be written to.
|
* @path : Path that shall be written to.
|
||||||
@ -4378,7 +4365,6 @@ bool config_save_file(const char *path)
|
|||||||
settings->uints.menu_border_light_color);
|
settings->uints.menu_border_light_color);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
video_driver_save_settings(conf);
|
video_driver_save_settings(conf);
|
||||||
|
|
||||||
#ifdef HAVE_LAKKA
|
#ifdef HAVE_LAKKA
|
||||||
@ -4651,7 +4637,6 @@ bool config_save_overrides(int override_type)
|
|||||||
config_set_int(conf, cfg, overrides->uints.input_joypad_map[i]);
|
config_set_int(conf, cfg, overrides->uints.input_joypad_map[i]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/* blacklist these since they are handled by remaps */
|
/* blacklist these since they are handled by remaps */
|
||||||
/* to-do: add setting to control blacklisting
|
/* to-do: add setting to control blacklisting
|
||||||
if (settings->uints.input_libretro_device[i]
|
if (settings->uints.input_libretro_device[i]
|
||||||
|
@ -134,7 +134,6 @@ bool core_set_default_callbacks(struct retro_callbacks *cbs)
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool core_deinit(void *data)
|
bool core_deinit(void *data)
|
||||||
{
|
{
|
||||||
struct retro_callbacks *cbs = (struct retro_callbacks*)data;
|
struct retro_callbacks *cbs = (struct retro_callbacks*)data;
|
||||||
@ -402,7 +401,6 @@ bool core_unload(void)
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool core_unload_game(void)
|
bool core_unload_game(void)
|
||||||
{
|
{
|
||||||
video_driver_free_hw_context();
|
video_driver_free_hw_context();
|
||||||
|
@ -224,4 +224,3 @@ void libretro_dummy_retro_cheat_set(unsigned idx,
|
|||||||
(void)code;
|
(void)code;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -16,7 +16,6 @@ AVUTIL_DIR := $(BASE_DIR)/libavutil
|
|||||||
SWSCALE_DIR := $(BASE_DIR)/libswscale
|
SWSCALE_DIR := $(BASE_DIR)/libswscale
|
||||||
SWRESAMPLE_DIR := $(BASE_DIR)/libswresample
|
SWRESAMPLE_DIR := $(BASE_DIR)/libswresample
|
||||||
|
|
||||||
|
|
||||||
INCFLAGS += -I$(BASE_DIR) -I$(CORE_DIR) -I$(LIBRETRO_COMM_DIR)/include -I$(LIBRETRO_COMM_DIR)/include/compat
|
INCFLAGS += -I$(BASE_DIR) -I$(CORE_DIR) -I$(LIBRETRO_COMM_DIR)/include -I$(LIBRETRO_COMM_DIR)/include/compat
|
||||||
|
|
||||||
LIBRETRO_SOURCE += $(CORE_DIR)/ffmpeg_core.c \
|
LIBRETRO_SOURCE += $(CORE_DIR)/ffmpeg_core.c \
|
||||||
|
@ -134,7 +134,6 @@ endif
|
|||||||
|
|
||||||
LIBS += -lm
|
LIBS += -lm
|
||||||
|
|
||||||
|
|
||||||
ifeq ($(HAVE_NEON),1)
|
ifeq ($(HAVE_NEON),1)
|
||||||
DEFINES += -DHAVE_NEON=1
|
DEFINES += -DHAVE_NEON=1
|
||||||
else
|
else
|
||||||
@ -163,7 +162,6 @@ CPUOPTS += -DARCH_BFIN=0
|
|||||||
#We can reasonably assume MMX will be there on all x86 CPUs from 1997 and up at least
|
#We can reasonably assume MMX will be there on all x86 CPUs from 1997 and up at least
|
||||||
#SSE2 can be assumed from Pentium 4 and up - can be switched on or off with the switch HAVE_SSE2
|
#SSE2 can be assumed from Pentium 4 and up - can be switched on or off with the switch HAVE_SSE2
|
||||||
|
|
||||||
|
|
||||||
ifeq ($(ARCH_X86),1)
|
ifeq ($(ARCH_X86),1)
|
||||||
CPUOPTS += -DHAVE_AMD3DNOW_INLINE=0
|
CPUOPTS += -DHAVE_AMD3DNOW_INLINE=0
|
||||||
CPUOPTS += -DHAVE_AMD3DNOWEXT_EXTERNAL=0
|
CPUOPTS += -DHAVE_AMD3DNOWEXT_EXTERNAL=0
|
||||||
@ -756,7 +754,6 @@ else
|
|||||||
DEFINES += -DCONFIG_LIBSPEEX_ENCODER=0
|
DEFINES += -DCONFIG_LIBSPEEX_ENCODER=0
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
||||||
ifeq ($(HAVE_LIBOPUS),1)
|
ifeq ($(HAVE_LIBOPUS),1)
|
||||||
DEFINES += -DCONFIG_LIBOPUS_ENCODER=1 \
|
DEFINES += -DCONFIG_LIBOPUS_ENCODER=1 \
|
||||||
-DCONFIG_OPUS_PARSER=1 \
|
-DCONFIG_OPUS_PARSER=1 \
|
||||||
@ -1265,7 +1262,6 @@ DEFINES += -DCONFIG_LIBOPUS_DECODER=0
|
|||||||
DEFINES += -DCONFIG_OPUS_MUXER=0
|
DEFINES += -DCONFIG_OPUS_MUXER=0
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
||||||
#libavutil
|
#libavutil
|
||||||
ifeq ($(INTERNAL_LIBAVUTIL),1)
|
ifeq ($(INTERNAL_LIBAVUTIL),1)
|
||||||
DEFINES += -DHAVE_AV_CONFIG_H
|
DEFINES += -DHAVE_AV_CONFIG_H
|
||||||
@ -1336,7 +1332,6 @@ ifeq ($(ARCH_ARM),1)
|
|||||||
LIBAVUTIL_SOURCE += $(filter-out $(AVUTIL_BLACKLIST),$(wildcard $(AVUTIL_DIR)/arm/*.c))
|
LIBAVUTIL_SOURCE += $(filter-out $(AVUTIL_BLACKLIST),$(wildcard $(AVUTIL_DIR)/arm/*.c))
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
||||||
ifeq ($(ARCH_PPC),1)
|
ifeq ($(ARCH_PPC),1)
|
||||||
LIBAVUTIL_SOURCE += $(AVUTIL_DIR)/ppc/cpu.c \
|
LIBAVUTIL_SOURCE += $(AVUTIL_DIR)/ppc/cpu.c \
|
||||||
$(AVUTIL_DIR)/ppc/float_dsp_init.c
|
$(AVUTIL_DIR)/ppc/float_dsp_init.c
|
||||||
@ -1468,7 +1463,6 @@ else
|
|||||||
DEFINES += -DCONFIG_XVMC=0
|
DEFINES += -DCONFIG_XVMC=0
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
||||||
AVCODEC_BLACKLIST := \
|
AVCODEC_BLACKLIST := \
|
||||||
$(AVCODEC_DIR)/arm/neontest.c \
|
$(AVCODEC_DIR)/arm/neontest.c \
|
||||||
$(AVCODEC_DIR)/vda.c \
|
$(AVCODEC_DIR)/vda.c \
|
||||||
|
@ -693,7 +693,6 @@ void CORE_PREFIX(retro_run)(void)
|
|||||||
glActiveTexture(GL_TEXTURE0);
|
glActiveTexture(GL_TEXTURE0);
|
||||||
glBindTexture(GL_TEXTURE_2D, frames[0].tex);
|
glBindTexture(GL_TEXTURE_2D, frames[0].tex);
|
||||||
|
|
||||||
|
|
||||||
glBindBuffer(GL_ARRAY_BUFFER, vbo);
|
glBindBuffer(GL_ARRAY_BUFFER, vbo);
|
||||||
glVertexAttribPointer(vertex_loc, 2, GL_FLOAT, GL_FALSE,
|
glVertexAttribPointer(vertex_loc, 2, GL_FLOAT, GL_FALSE,
|
||||||
4 * sizeof(GLfloat), (const GLvoid*)(0 * sizeof(GLfloat)));
|
4 * sizeof(GLfloat), (const GLvoid*)(0 * sizeof(GLfloat)));
|
||||||
@ -1664,7 +1663,6 @@ error:
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
unsigned CORE_PREFIX(retro_get_region)(void)
|
unsigned CORE_PREFIX(retro_get_region)(void)
|
||||||
{
|
{
|
||||||
return RETRO_REGION_NTSC;
|
return RETRO_REGION_NTSC;
|
||||||
|
@ -275,7 +275,6 @@ static bool imageviewer_load(const char *path, int image_index)
|
|||||||
|
|
||||||
process_new_image = true;
|
process_new_image = true;
|
||||||
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -293,7 +292,6 @@ bool IMAGE_CORE_PREFIX(retro_load_game)(const struct retro_game_info *info)
|
|||||||
dir_list_sort(file_list, false);
|
dir_list_sort(file_list, false);
|
||||||
free(dir);
|
free(dir);
|
||||||
|
|
||||||
|
|
||||||
if (!IMAGE_CORE_PREFIX(environ_cb)(RETRO_ENVIRONMENT_SET_PIXEL_FORMAT, &fmt))
|
if (!IMAGE_CORE_PREFIX(environ_cb)(RETRO_ENVIRONMENT_SET_PIXEL_FORMAT, &fmt))
|
||||||
{
|
{
|
||||||
if (IMAGE_CORE_PREFIX(log_cb))
|
if (IMAGE_CORE_PREFIX(log_cb))
|
||||||
@ -312,7 +310,6 @@ bool IMAGE_CORE_PREFIX(retro_load_game_special)(unsigned a, const struct retro_g
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void IMAGE_CORE_PREFIX(retro_unload_game)(void)
|
void IMAGE_CORE_PREFIX(retro_unload_game)(void)
|
||||||
{
|
{
|
||||||
imageviewer_free_image();
|
imageviewer_free_image();
|
||||||
@ -335,7 +332,6 @@ size_t IMAGE_CORE_PREFIX(retro_get_memory_size)(unsigned id)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void IMAGE_CORE_PREFIX(retro_run)(void)
|
void IMAGE_CORE_PREFIX(retro_run)(void)
|
||||||
{
|
{
|
||||||
bool first_image = false;
|
bool first_image = false;
|
||||||
|
@ -103,7 +103,6 @@ else
|
|||||||
SHARED := -shared -static-libgcc -static-libstdc++ -s -Wl,--version-script=link.T -Wl,--no-undefined
|
SHARED := -shared -static-libgcc -static-libstdc++ -s -Wl,--version-script=link.T -Wl,--no-undefined
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
||||||
LDFLAGS += $(LIBM)
|
LDFLAGS += $(LIBM)
|
||||||
|
|
||||||
ifeq ($(platform), win)
|
ifeq ($(platform), win)
|
||||||
|
@ -276,7 +276,6 @@ void NETRETROPAD_CORE_PREFIX(retro_set_environment)(retro_environment_t cb)
|
|||||||
enum retro_pixel_format fmt = RETRO_PIXEL_FORMAT_RGB565;
|
enum retro_pixel_format fmt = RETRO_PIXEL_FORMAT_RGB565;
|
||||||
cb(RETRO_ENVIRONMENT_SET_VARIABLES, (void*)vars);
|
cb(RETRO_ENVIRONMENT_SET_VARIABLES, (void*)vars);
|
||||||
|
|
||||||
|
|
||||||
NETRETROPAD_CORE_PREFIX(environ_cb) = cb;
|
NETRETROPAD_CORE_PREFIX(environ_cb) = cb;
|
||||||
bool no_content = true;
|
bool no_content = true;
|
||||||
cb(RETRO_ENVIRONMENT_SET_SUPPORT_NO_GAME, &no_content);
|
cb(RETRO_ENVIRONMENT_SET_SUPPORT_NO_GAME, &no_content);
|
||||||
@ -379,7 +378,6 @@ void NETRETROPAD_CORE_PREFIX(retro_run)(void)
|
|||||||
pixel += 65;
|
pixel += 65;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
NETRETROPAD_CORE_PREFIX(video_cb)(frame_buf, 320, 240, 640);
|
NETRETROPAD_CORE_PREFIX(video_cb)(frame_buf, 320, 240, 640);
|
||||||
|
|
||||||
retro_sleep(4);
|
retro_sleep(4);
|
||||||
|
@ -102,7 +102,6 @@ static uint32_t *frame_prev2;
|
|||||||
static uint32_t *frame_prev3;
|
static uint32_t *frame_prev3;
|
||||||
static uint32_t *frame_curr;
|
static uint32_t *frame_curr;
|
||||||
|
|
||||||
|
|
||||||
// Frametime debug messages
|
// Frametime debug messages
|
||||||
struct timeval ft_prevtime = { 0 }, ft_prevtime2 = { 0 };
|
struct timeval ft_prevtime = { 0 }, ft_prevtime2 = { 0 };
|
||||||
char *ft_info = NULL, *ft_info2 = NULL;
|
char *ft_info = NULL, *ft_info2 = NULL;
|
||||||
@ -660,7 +659,6 @@ void source_v4l2_normal(int width, int height) {
|
|||||||
v4l2_frame_times(bufcp);
|
v4l2_frame_times(bufcp);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void source_v4l2_alternate_hack(int width, int height) {
|
void source_v4l2_alternate_hack(int width, int height) {
|
||||||
struct v4l2_buffer bufcp;
|
struct v4l2_buffer bufcp;
|
||||||
struct v4l2_format fmt;
|
struct v4l2_format fmt;
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
/* from https://github.com/smealum/ctrulib
|
/* from https://github.com/smealum/ctrulib
|
||||||
* modified to allow reducing __linear_heap_size at runtime */
|
* modified to allow reducing __linear_heap_size at runtime */
|
||||||
|
|
||||||
|
|
||||||
#include <3ds.h>
|
#include <3ds.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <3ds/util/rbtree.h>
|
#include <3ds/util/rbtree.h>
|
||||||
@ -245,7 +244,6 @@ extern "C" u32 ctr_get_linear_unused(void)
|
|||||||
return __linear_heap + __linear_heap_size - sLinearPool_maxaddr;
|
return __linear_heap + __linear_heap_size - sLinearPool_maxaddr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
extern "C" void ctr_linear_free_pages(u32 pages)
|
extern "C" void ctr_linear_free_pages(u32 pages)
|
||||||
{
|
{
|
||||||
if(sLinearPool.last->base + sLinearPool.last->size != (u8*)__linear_heap + __linear_heap_size)
|
if(sLinearPool.last->base + sLinearPool.last->size != (u8*)__linear_heap + __linear_heap_size)
|
||||||
|
@ -379,7 +379,6 @@ static void do_memchunkhax2(void)
|
|||||||
APT_SetAppCpuTimeLimit(mch2.old_cpu_time_limit);
|
APT_SetAppCpuTimeLimit(mch2.old_cpu_time_limit);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void gspwn(u32 dst, u32 src, u32 size, u8* flush_buffer)
|
static void gspwn(u32 dst, u32 src, u32 size, u8* flush_buffer)
|
||||||
{
|
{
|
||||||
extern Handle gspEvents[GSPGPU_EVENT_MAX];
|
extern Handle gspEvents[GSPGPU_EVENT_MAX];
|
||||||
|
@ -93,7 +93,6 @@ void __attribute__((weak)) __libctru_init(void (*retAddr)(void))
|
|||||||
__system_allocateHeaps();
|
__system_allocateHeaps();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
Result __sync_fini(void) __attribute__((weak));
|
Result __sync_fini(void) __attribute__((weak));
|
||||||
|
|
||||||
extern char** __system_argv;
|
extern char** __system_argv;
|
||||||
@ -299,7 +298,6 @@ void wait_for_input(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
long sysconf(int name)
|
long sysconf(int name)
|
||||||
{
|
{
|
||||||
switch (name)
|
switch (name)
|
||||||
|
@ -5,14 +5,12 @@
|
|||||||
|
|
||||||
#include "mini-hb-menu/common.h"
|
#include "mini-hb-menu/common.h"
|
||||||
|
|
||||||
|
|
||||||
extern const loaderFuncs_s loader_Ninjhax1;
|
extern const loaderFuncs_s loader_Ninjhax1;
|
||||||
extern const loaderFuncs_s loader_Ninjhax2;
|
extern const loaderFuncs_s loader_Ninjhax2;
|
||||||
extern const loaderFuncs_s loader_Rosalina;
|
extern const loaderFuncs_s loader_Rosalina;
|
||||||
|
|
||||||
static void (*launch_3dsx)(const char* path, argData_s* args, executableMetadata_s* em);
|
static void (*launch_3dsx)(const char* path, argData_s* args, executableMetadata_s* em);
|
||||||
|
|
||||||
|
|
||||||
static int exec_3dsx_actual(const char* path, const char** args, bool appendPath){
|
static int exec_3dsx_actual(const char* path, const char** args, bool appendPath){
|
||||||
struct stat sBuff;
|
struct stat sBuff;
|
||||||
argData_s newProgramArgs;
|
argData_s newProgramArgs;
|
||||||
|
@ -4,16 +4,13 @@
|
|||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
#include <3ds.h>
|
#include <3ds.h>
|
||||||
|
|
||||||
|
|
||||||
#define FILE_CHUNK_SIZE 4096
|
#define FILE_CHUNK_SIZE 4096
|
||||||
|
|
||||||
|
|
||||||
typedef struct{
|
typedef struct{
|
||||||
u32 argc;
|
u32 argc;
|
||||||
char args[0x300 - 0x4];
|
char args[0x300 - 0x4];
|
||||||
}ciaParam;
|
}ciaParam;
|
||||||
|
|
||||||
|
|
||||||
char argvHmac[0x20] = {0x1d, 0x78, 0xff, 0xb9, 0xc5, 0xbc, 0x78, 0xb7, 0xac, 0x29, 0x1d, 0x3e, 0x16, 0xd0, 0xcf, 0x53, 0xef, 0x12, 0x58, 0x83, 0xb6, 0x9e, 0x2f, 0x79, 0x47, 0xf9, 0x35, 0x61, 0xeb, 0x50, 0xd7, 0x67};
|
char argvHmac[0x20] = {0x1d, 0x78, 0xff, 0xb9, 0xc5, 0xbc, 0x78, 0xb7, 0xac, 0x29, 0x1d, 0x3e, 0x16, 0xd0, 0xcf, 0x53, 0xef, 0x12, 0x58, 0x83, 0xb6, 0x9e, 0x2f, 0x79, 0x47, 0xf9, 0x35, 0x61, 0xeb, 0x50, 0xd7, 0x67};
|
||||||
|
|
||||||
|
|
||||||
|
@ -35,7 +35,6 @@ void GPU_SetFloatUniform(GPU_SHADER_TYPE type, u32 startreg, u32* data, u32 numr
|
|||||||
GPUCMD_AddWrites(GPUREG_VSH_FLOATUNIFORM_DATA+regOffset, data, numreg*4);
|
GPUCMD_AddWrites(GPUREG_VSH_FLOATUNIFORM_DATA+regOffset, data, numreg*4);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//takes PAs as arguments
|
//takes PAs as arguments
|
||||||
void GPU_SetViewport(u32* depthBuffer, u32* colorBuffer, u32 x, u32 y, u32 w, u32 h)
|
void GPU_SetViewport(u32* depthBuffer, u32* colorBuffer, u32 x, u32 y, u32 w, u32 h)
|
||||||
{
|
{
|
||||||
@ -307,7 +306,6 @@ void GPU_FinishDrawing()
|
|||||||
GPUCMD_AddWrite(GPUREG_EARLYDEPTH_CLEAR, 0x00000001);
|
GPUCMD_AddWrite(GPUREG_EARLYDEPTH_CLEAR, 0x00000001);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void GPU_Finalize(void)
|
void GPU_Finalize(void)
|
||||||
{
|
{
|
||||||
GPUCMD_AddMaskedWrite(GPUREG_PRIMITIVE_CONFIG, 0x8, 0x00000000);
|
GPUCMD_AddMaskedWrite(GPUREG_PRIMITIVE_CONFIG, 0x8, 0x00000000);
|
||||||
|
@ -148,7 +148,6 @@ char *bin_to_hex_alloc(const uint8_t *data, size_t len)
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static int database_cursor_iterate(libretrodb_cursor_t *cur,
|
static int database_cursor_iterate(libretrodb_cursor_t *cur,
|
||||||
database_info_t *db_info)
|
database_info_t *db_info)
|
||||||
{
|
{
|
||||||
|
@ -181,7 +181,6 @@ static void handle_discord_join_cb(void *task_data, void *user_data, const char
|
|||||||
room->host_method == NETPLAY_HOST_METHOD_MITM ? room->mitm_address : room->address,
|
room->host_method == NETPLAY_HOST_METHOD_MITM ? room->mitm_address : room->address,
|
||||||
room->host_method == NETPLAY_HOST_METHOD_MITM ? room->mitm_port : room->port);
|
room->host_method == NETPLAY_HOST_METHOD_MITM ? room->mitm_port : room->port);
|
||||||
|
|
||||||
|
|
||||||
RARCH_LOG("[Discord] joining lobby at: %s\n", tmp_hostname);
|
RARCH_LOG("[Discord] joining lobby at: %s\n", tmp_hostname);
|
||||||
task_push_netplay_crc_scan(room->gamecrc,
|
task_push_netplay_crc_scan(room->gamecrc,
|
||||||
room->gamename, tmp_hostname, room->corename);
|
room->gamename, tmp_hostname, room->corename);
|
||||||
@ -217,7 +216,6 @@ static void handle_discord_join(const char* secret)
|
|||||||
strlcat(url, "/", sizeof(url));
|
strlcat(url, "/", sizeof(url));
|
||||||
RARCH_LOG("[Discord] querying lobby id: %s at %s\n", list->elems[0].data, url);
|
RARCH_LOG("[Discord] querying lobby id: %s at %s\n", list->elems[0].data, url);
|
||||||
|
|
||||||
|
|
||||||
snprintf(tmp_hostname,
|
snprintf(tmp_hostname,
|
||||||
sizeof(tmp_hostname),
|
sizeof(tmp_hostname),
|
||||||
"%s|%s", list->elems[0].data, list->elems[1].data);
|
"%s|%s", list->elems[0].data, list->elems[1].data);
|
||||||
@ -236,8 +234,6 @@ static void handle_discord_join_response(void *ignore, const char *line)
|
|||||||
if (strstr(line, "yes"))
|
if (strstr(line, "yes"))
|
||||||
Discord_Respond(user_id, DISCORD_REPLY_YES);
|
Discord_Respond(user_id, DISCORD_REPLY_YES);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef HAVE_MENU
|
#ifdef HAVE_MENU
|
||||||
menu_input_dialog_end();
|
menu_input_dialog_end();
|
||||||
rarch_menu_running_finished();
|
rarch_menu_running_finished();
|
||||||
|
1
driver.c
1
driver.c
@ -408,7 +408,6 @@ void drivers_init(int flags)
|
|||||||
midi_driver_init();
|
midi_driver_init();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* uninit_drivers:
|
* uninit_drivers:
|
||||||
* @flags : Bitmask of drivers to deinitialize.
|
* @flags : Bitmask of drivers to deinitialize.
|
||||||
|
@ -177,7 +177,6 @@ void libretro_free_system_info(struct retro_system_info *info)
|
|||||||
memset(info, 0, sizeof(*info));
|
memset(info, 0, sizeof(*info));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static bool environ_cb_get_system_info(unsigned cmd, void *data)
|
static bool environ_cb_get_system_info(unsigned cmd, void *data)
|
||||||
{
|
{
|
||||||
rarch_system_info_t *system = runloop_get_system_info();
|
rarch_system_info_t *system = runloop_get_system_info();
|
||||||
@ -240,7 +239,6 @@ static bool environ_cb_get_system_info(unsigned cmd, void *data)
|
|||||||
subsystem_data[i].roms = subsystem_data_roms[i];
|
subsystem_data[i].roms = subsystem_data_roms[i];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
subsystem_current_count = size <= SUBSYSTEM_MAX_SUBSYSTEMS ? size : SUBSYSTEM_MAX_SUBSYSTEMS;
|
subsystem_current_count = size <= SUBSYSTEM_MAX_SUBSYSTEMS ? size : SUBSYSTEM_MAX_SUBSYSTEMS;
|
||||||
#if 0
|
#if 0
|
||||||
RARCH_LOG("Subsystems: %d\n", subsystem_current_count);
|
RARCH_LOG("Subsystems: %d\n", subsystem_current_count);
|
||||||
|
@ -81,7 +81,6 @@ int main(int argc, char *argv[])
|
|||||||
|
|
||||||
sceSystemServiceHideSplashScreen();
|
sceSystemServiceHideSplashScreen();
|
||||||
|
|
||||||
|
|
||||||
uintptr_t intptr=0;
|
uintptr_t intptr=0;
|
||||||
sscanf(argv[1],"%p",&intptr);
|
sscanf(argv[1],"%p",&intptr);
|
||||||
myConf=(OrbisGlobalConf *)intptr;
|
myConf=(OrbisGlobalConf *)intptr;
|
||||||
@ -215,7 +214,6 @@ static void frontend_orbis_shutdown(bool unused)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void frontend_orbis_init(void *data)
|
static void frontend_orbis_init(void *data)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
@ -656,7 +656,6 @@ static void frontend_switch_shutdown(bool unused)
|
|||||||
/* runloop_get_system_info isnt initialized that early.. */
|
/* runloop_get_system_info isnt initialized that early.. */
|
||||||
extern void retro_get_system_info(struct retro_system_info *info);
|
extern void retro_get_system_info(struct retro_system_info *info);
|
||||||
|
|
||||||
|
|
||||||
static void frontend_switch_init(void *data)
|
static void frontend_switch_init(void *data)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
@ -1824,7 +1824,6 @@ static void frontend_unix_get_env(int *argc,
|
|||||||
else if (strstr(device_model, "JSS15J"))
|
else if (strstr(device_model, "JSS15J"))
|
||||||
g_defaults.settings.video_refresh_rate = 59.65;
|
g_defaults.settings.video_refresh_rate = 59.65;
|
||||||
|
|
||||||
|
|
||||||
/* For gamepad-like/console devices:
|
/* For gamepad-like/console devices:
|
||||||
*
|
*
|
||||||
* - Explicitly disable input overlay by default
|
* - Explicitly disable input overlay by default
|
||||||
|
@ -104,7 +104,6 @@ struct android_app
|
|||||||
* receive user input events. */
|
* receive user input events. */
|
||||||
AInputQueue* inputQueue;
|
AInputQueue* inputQueue;
|
||||||
|
|
||||||
|
|
||||||
/* When non-NULL, this is the window surface that the app can draw in. */
|
/* When non-NULL, this is the window surface that the app can draw in. */
|
||||||
ANativeWindow* window;
|
ANativeWindow* window;
|
||||||
|
|
||||||
@ -165,7 +164,6 @@ struct android_app
|
|||||||
jmethodID setSustainedPerformanceMode;
|
jmethodID setSustainedPerformanceMode;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
enum
|
enum
|
||||||
{
|
{
|
||||||
LOOPER_ID_MAIN = 1,
|
LOOPER_ID_MAIN = 1,
|
||||||
|
@ -86,7 +86,6 @@ static void frontend_uwp_get_os(char *s, size_t len, int *major, int *minor)
|
|||||||
GetVersionEx(&vi);
|
GetVersionEx(&vi);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
if (major)
|
if (major)
|
||||||
*major = vi.dwMajorVersion;
|
*major = vi.dwMajorVersion;
|
||||||
|
|
||||||
|
@ -133,7 +133,6 @@ static void frontend_wiiu_init(void *data)
|
|||||||
DEBUG_LINE();
|
DEBUG_LINE();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static int frontend_wiiu_get_rating(void)
|
static int frontend_wiiu_get_rating(void)
|
||||||
{
|
{
|
||||||
return 10;
|
return 10;
|
||||||
@ -168,7 +167,6 @@ static int frontend_wiiu_parse_drive_list(void *data, bool load_content)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void frontend_wiiu_exec(const char *path, bool should_load_game)
|
static void frontend_wiiu_exec(const char *path, bool should_load_game)
|
||||||
{
|
{
|
||||||
|
|
||||||
@ -269,7 +267,6 @@ static void frontend_wiiu_exitspawn(char *s, size_t len)
|
|||||||
frontend_wiiu_exec(s, should_load_game);
|
frontend_wiiu_exec(s, should_load_game);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
frontend_ctx_driver_t frontend_ctx_wiiu =
|
frontend_ctx_driver_t frontend_ctx_wiiu =
|
||||||
{
|
{
|
||||||
frontend_wiiu_get_environment_settings,
|
frontend_wiiu_get_environment_settings,
|
||||||
|
@ -191,7 +191,6 @@ static void frontend_win32_get_os(char *s, size_t len, int *major, int *minor)
|
|||||||
GetVersionEx(&vi);
|
GetVersionEx(&vi);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
if (major)
|
if (major)
|
||||||
*major = vi.dwMajorVersion;
|
*major = vi.dwMajorVersion;
|
||||||
|
|
||||||
|
@ -138,5 +138,4 @@ static INLINE void ctr_set_scale_vector(ctr_scale_vector_t* vec,
|
|||||||
vec->v = -1.0 / texture_height;
|
vec->v = -1.0 / texture_height;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#endif // CTR_COMMON_H__
|
#endif // CTR_COMMON_H__
|
||||||
|
@ -54,7 +54,6 @@ typedef ID3D10Debug* D3D10Debug;
|
|||||||
typedef ID3D10SwitchToRef* D3D10SwitchToRef;
|
typedef ID3D10SwitchToRef* D3D10SwitchToRef;
|
||||||
typedef ID3D10InfoQueue* D3D10InfoQueue;
|
typedef ID3D10InfoQueue* D3D10InfoQueue;
|
||||||
|
|
||||||
|
|
||||||
#if !defined(__cplusplus) || defined(CINTERFACE)
|
#if !defined(__cplusplus) || defined(CINTERFACE)
|
||||||
static INLINE void D3D10SetResourceEvictionPriority(D3D10Resource resource, UINT eviction_priority)
|
static INLINE void D3D10SetResourceEvictionPriority(D3D10Resource resource, UINT eviction_priority)
|
||||||
{
|
{
|
||||||
|
@ -75,7 +75,6 @@ typedef HRESULT (__stdcall
|
|||||||
LPD3DXFONT* ppFont);
|
LPD3DXFONT* ppFont);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
#ifdef HAVE_D3DX
|
#ifdef HAVE_D3DX
|
||||||
static D3DXCreateFontIndirect_t D3DCreateFontIndirect;
|
static D3DXCreateFontIndirect_t D3DCreateFontIndirect;
|
||||||
static D3DCreateTextureFromFile_t D3DCreateTextureFromFile;
|
static D3DCreateTextureFromFile_t D3DCreateTextureFromFile;
|
||||||
|
@ -99,7 +99,6 @@ typedef HRESULT (__stdcall
|
|||||||
LPD3DXFONT* ppFont);
|
LPD3DXFONT* ppFont);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
#ifdef HAVE_D3DX
|
#ifdef HAVE_D3DX
|
||||||
static D3D9XCreateFontIndirect_t D3D9CreateFontIndirect;
|
static D3D9XCreateFontIndirect_t D3D9CreateFontIndirect;
|
||||||
static D3D9CreateTextureFromFile_t D3D9CreateTextureFromFile;
|
static D3D9CreateTextureFromFile_t D3D9CreateTextureFromFile;
|
||||||
|
@ -36,7 +36,6 @@ void *d3d_matrix_transpose(void *_pout, const void *_pm)
|
|||||||
return pout;
|
return pout;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void *d3d_matrix_identity(void *_pout)
|
void *d3d_matrix_identity(void *_pout)
|
||||||
{
|
{
|
||||||
struct d3d_matrix *pout = (struct d3d_matrix*)_pout;
|
struct d3d_matrix *pout = (struct d3d_matrix*)_pout;
|
||||||
|
@ -54,7 +54,6 @@ struct d3d_matrix
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
typedef struct d3d_texture
|
typedef struct d3d_texture
|
||||||
{
|
{
|
||||||
void *data;
|
void *data;
|
||||||
|
@ -44,7 +44,6 @@ extern MTLPixelFormat SelectOptimalPixelFormat(MTLPixelFormat fmt);
|
|||||||
|
|
||||||
@end
|
@end
|
||||||
|
|
||||||
|
|
||||||
@interface MetalMenu : NSObject
|
@interface MetalMenu : NSObject
|
||||||
|
|
||||||
@property (nonatomic, readonly) bool hasFrame;
|
@property (nonatomic, readonly) bool hasFrame;
|
||||||
@ -59,7 +58,6 @@ extern MTLPixelFormat SelectOptimalPixelFormat(MTLPixelFormat fmt);
|
|||||||
filter:(RTextureFilter)filter;
|
filter:(RTextureFilter)filter;
|
||||||
@end
|
@end
|
||||||
|
|
||||||
|
|
||||||
@interface Overlay : NSObject
|
@interface Overlay : NSObject
|
||||||
@property (nonatomic, readwrite) bool enabled;
|
@property (nonatomic, readwrite) bool enabled;
|
||||||
@property (nonatomic, readwrite) bool fullscreen;
|
@property (nonatomic, readwrite) bool fullscreen;
|
||||||
|
@ -264,7 +264,6 @@ void vulkan_buffer_chain_free(
|
|||||||
VkDevice device,
|
VkDevice device,
|
||||||
struct vk_buffer_chain *chain);
|
struct vk_buffer_chain *chain);
|
||||||
|
|
||||||
|
|
||||||
struct vk_descriptor_pool
|
struct vk_descriptor_pool
|
||||||
{
|
{
|
||||||
VkDescriptorPool pool;
|
VkDescriptorPool pool;
|
||||||
@ -444,7 +443,6 @@ uint32_t vulkan_find_memory_type_fallback(
|
|||||||
uint32_t device_reqs, uint32_t host_reqs_first,
|
uint32_t device_reqs, uint32_t host_reqs_first,
|
||||||
uint32_t host_reqs_second);
|
uint32_t host_reqs_second);
|
||||||
|
|
||||||
|
|
||||||
struct vk_texture vulkan_create_texture(vk_t *vk,
|
struct vk_texture vulkan_create_texture(vk_t *vk,
|
||||||
struct vk_texture *old,
|
struct vk_texture *old,
|
||||||
unsigned width, unsigned height,
|
unsigned width, unsigned height,
|
||||||
|
@ -37,7 +37,6 @@ typedef struct
|
|||||||
int16_t y;
|
int16_t y;
|
||||||
} wayland_touch_data_t;
|
} wayland_touch_data_t;
|
||||||
|
|
||||||
|
|
||||||
typedef struct input_ctx_wayland_data
|
typedef struct input_ctx_wayland_data
|
||||||
{
|
{
|
||||||
/* Wayland uses Linux keysyms. */
|
/* Wayland uses Linux keysyms. */
|
||||||
|
@ -180,8 +180,6 @@ typedef struct DISPLAYCONFIG_PATH_TARGET_INFO_CUSTOM {
|
|||||||
UINT32 statusFlags;
|
UINT32 statusFlags;
|
||||||
} DISPLAYCONFIG_PATH_TARGET_INFO_CUSTOM;
|
} DISPLAYCONFIG_PATH_TARGET_INFO_CUSTOM;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
typedef struct DISPLAYCONFIG_PATH_INFO_CUSTOM {
|
typedef struct DISPLAYCONFIG_PATH_INFO_CUSTOM {
|
||||||
DISPLAYCONFIG_PATH_SOURCE_INFO_CUSTOM sourceInfo;
|
DISPLAYCONFIG_PATH_SOURCE_INFO_CUSTOM sourceInfo;
|
||||||
DISPLAYCONFIG_PATH_TARGET_INFO_CUSTOM targetInfo;
|
DISPLAYCONFIG_PATH_TARGET_INFO_CUSTOM targetInfo;
|
||||||
@ -345,7 +343,6 @@ INT_PTR_COMPAT CALLBACK PickCoreProc(HWND hDlg, UINT message,
|
|||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static BOOL CALLBACK win32_monitor_enum_proc(HMONITOR hMonitor,
|
static BOOL CALLBACK win32_monitor_enum_proc(HMONITOR hMonitor,
|
||||||
HDC hdcMonitor, LPRECT lprcMonitor, LPARAM dwData)
|
HDC hdcMonitor, LPRECT lprcMonitor, LPARAM dwData)
|
||||||
{
|
{
|
||||||
@ -353,7 +350,6 @@ static BOOL CALLBACK win32_monitor_enum_proc(HMONITOR hMonitor,
|
|||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void win32_monitor_from_window(void)
|
void win32_monitor_from_window(void)
|
||||||
{
|
{
|
||||||
#ifndef _XBOX
|
#ifndef _XBOX
|
||||||
@ -1337,7 +1333,6 @@ bool win32_set_video_mode(void *data,
|
|||||||
&mon_rect, width, height, fullscreen))
|
&mon_rect, width, height, fullscreen))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
|
||||||
win32_set_window(&width, &height,
|
win32_set_window(&width, &height,
|
||||||
fullscreen, windowed_full, &rect);
|
fullscreen, windowed_full, &rect);
|
||||||
|
|
||||||
|
@ -55,7 +55,6 @@
|
|||||||
#define MOVERESIZE_X_SHIFT 8
|
#define MOVERESIZE_X_SHIFT 8
|
||||||
#define MOVERESIZE_Y_SHIFT 9
|
#define MOVERESIZE_Y_SHIFT 9
|
||||||
|
|
||||||
|
|
||||||
static XF86VidModeModeInfo desktop_mode;
|
static XF86VidModeModeInfo desktop_mode;
|
||||||
static bool xdg_screensaver_available = true;
|
static bool xdg_screensaver_available = true;
|
||||||
bool g_x11_entered = false;
|
bool g_x11_entered = false;
|
||||||
|
@ -128,7 +128,6 @@ static INLINE void ctr_set_screen_coords(ctr_video_t * ctr)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void ctr_update_viewport(ctr_video_t* ctr, video_frame_info_t *video_info)
|
static void ctr_update_viewport(ctr_video_t* ctr, video_frame_info_t *video_info)
|
||||||
{
|
{
|
||||||
int x = 0;
|
int x = 0;
|
||||||
@ -203,7 +202,6 @@ static void ctr_update_viewport(ctr_video_t* ctr, video_frame_info_t *video_info
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void ctr_lcd_aptHook(APT_HookType hook, void* param)
|
static void ctr_lcd_aptHook(APT_HookType hook, void* param)
|
||||||
{
|
{
|
||||||
ctr_video_t *ctr = (ctr_video_t*)param;
|
ctr_video_t *ctr = (ctr_video_t*)param;
|
||||||
@ -534,7 +532,6 @@ static bool ctr_frame(void* data, const void* frame,
|
|||||||
ctr_set_bottom_screen_enable(ctr, !ctr_bottom_screen_enabled);
|
ctr_set_bottom_screen_enable(ctr, !ctr_bottom_screen_enabled);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if (ctr->p3d_event_pending)
|
if (ctr->p3d_event_pending)
|
||||||
{
|
{
|
||||||
gspWaitForEvent(GSPGPU_EVENT_P3D, false);
|
gspWaitForEvent(GSPGPU_EVENT_P3D, false);
|
||||||
@ -576,7 +573,6 @@ static bool ctr_frame(void* data, const void* frame,
|
|||||||
frames = 0;
|
frames = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#ifdef CTR_INSPECT_MEMORY_USAGE
|
#ifdef CTR_INSPECT_MEMORY_USAGE
|
||||||
uint32_t ctr_get_stack_usage(void);
|
uint32_t ctr_get_stack_usage(void);
|
||||||
void ctr_linear_get_stats(void);
|
void ctr_linear_get_stats(void);
|
||||||
@ -821,7 +817,6 @@ static bool ctr_frame(void* data, const void* frame,
|
|||||||
CTRGU_RGBA8,
|
CTRGU_RGBA8,
|
||||||
gfxTopLeftFramebuffers[ctr->current_buffer_top], 240,CTRGU_RGB8, CTRGU_MULTISAMPLE_NONE);
|
gfxTopLeftFramebuffers[ctr->current_buffer_top], 240,CTRGU_RGB8, CTRGU_MULTISAMPLE_NONE);
|
||||||
|
|
||||||
|
|
||||||
if ((ctr->video_mode == CTR_VIDEO_MODE_400x240) || (ctr->video_mode == CTR_VIDEO_MODE_3D))
|
if ((ctr->video_mode == CTR_VIDEO_MODE_400x240) || (ctr->video_mode == CTR_VIDEO_MODE_3D))
|
||||||
ctrGuDisplayTransfer(true, ctr->drawbuffers.top.right,
|
ctrGuDisplayTransfer(true, ctr->drawbuffers.top.right,
|
||||||
240,
|
240,
|
||||||
@ -829,7 +824,6 @@ static bool ctr_frame(void* data, const void* frame,
|
|||||||
CTRGU_RGBA8,
|
CTRGU_RGBA8,
|
||||||
gfxTopRightFramebuffers[ctr->current_buffer_top], 240,CTRGU_RGB8, CTRGU_MULTISAMPLE_NONE);
|
gfxTopRightFramebuffers[ctr->current_buffer_top], 240,CTRGU_RGB8, CTRGU_MULTISAMPLE_NONE);
|
||||||
|
|
||||||
|
|
||||||
/* Swap buffers : */
|
/* Swap buffers : */
|
||||||
|
|
||||||
topFramebufferInfo.
|
topFramebufferInfo.
|
||||||
@ -852,7 +846,6 @@ static bool ctr_frame(void* data, const void* frame,
|
|||||||
framebuf_widthbytesize = 240 * 3;
|
framebuf_widthbytesize = 240 * 3;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
topFramebufferInfo.format = (1<<8)|(1<<5)|GSP_BGR8_OES;
|
topFramebufferInfo.format = (1<<8)|(1<<5)|GSP_BGR8_OES;
|
||||||
topFramebufferInfo.
|
topFramebufferInfo.
|
||||||
framebuf_dispselect = ctr->current_buffer_top;
|
framebuf_dispselect = ctr->current_buffer_top;
|
||||||
@ -979,7 +972,6 @@ static void ctr_set_texture_enable(void* data, bool state, bool full_screen)
|
|||||||
ctr->menu_texture_enable = state;
|
ctr->menu_texture_enable = state;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void ctr_set_rotation(void* data, unsigned rotation)
|
static void ctr_set_rotation(void* data, unsigned rotation)
|
||||||
{
|
{
|
||||||
ctr_video_t* ctr = (ctr_video_t*)data;
|
ctr_video_t* ctr = (ctr_video_t*)data;
|
||||||
@ -1069,7 +1061,6 @@ static uintptr_t ctr_load_texture(void *video_data, void *data,
|
|||||||
texture->data = linearAlloc(texture->width * texture->height * sizeof(uint32_t));
|
texture->data = linearAlloc(texture->width * texture->height * sizeof(uint32_t));
|
||||||
texture->type = filter_type;
|
texture->type = filter_type;
|
||||||
|
|
||||||
|
|
||||||
if (!texture->data)
|
if (!texture->data)
|
||||||
{
|
{
|
||||||
free(texture);
|
free(texture);
|
||||||
@ -1108,7 +1099,6 @@ static uintptr_t ctr_load_texture(void *video_data, void *data,
|
|||||||
src++;
|
src++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
GSPGPU_FlushDataCache(tmpdata, image->width * image->height * sizeof(uint32_t));
|
GSPGPU_FlushDataCache(tmpdata, image->width * image->height * sizeof(uint32_t));
|
||||||
ctrGuCopyImage(true, tmpdata, image->width, image->height, CTRGU_RGBA8, false,
|
ctrGuCopyImage(true, tmpdata, image->width, image->height, CTRGU_RGBA8, false,
|
||||||
texture->data, texture->width, CTRGU_RGBA8, true);
|
texture->data, texture->width, CTRGU_RGBA8, true);
|
||||||
|
@ -65,7 +65,6 @@ static INLINE Result ctr_set_parallax_layer(bool state)
|
|||||||
return GSPGPU_WriteHWRegs(0x202000, ®_state, 4);
|
return GSPGPU_WriteHWRegs(0x202000, ®_state, 4);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
__attribute__((always_inline))
|
__attribute__((always_inline))
|
||||||
static INLINE void ctrGuSetTexture(GPU_TEXUNIT unit, u32* data,
|
static INLINE void ctrGuSetTexture(GPU_TEXUNIT unit, u32* data,
|
||||||
u16 width, u16 height, u32 param, GPU_TEXCOLOR colorType)
|
u16 width, u16 height, u32 param, GPU_TEXCOLOR colorType)
|
||||||
@ -198,7 +197,6 @@ static INLINE void ctrGuSetVertexShaderFloatUniform(int id, float* data, int cou
|
|||||||
GPUCMD_AddWrites(GPUREG_VSH_FLOATUNIFORM_DATA, (u32*)data, (u32)count * 4);
|
GPUCMD_AddWrites(GPUREG_VSH_FLOATUNIFORM_DATA, (u32*)data, (u32)count * 4);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#define CTRGU_ATTRIBFMT(f, n) ((((n)-1)<<2)|((f)&3))
|
#define CTRGU_ATTRIBFMT(f, n) ((((n)-1)<<2)|((f)&3))
|
||||||
|
|
||||||
__attribute__((always_inline))
|
__attribute__((always_inline))
|
||||||
@ -243,7 +241,6 @@ static INLINE int ctrgu_swizzle_coords(int x, int y, int width)
|
|||||||
int pos = (x & 0x1) << 0 | ((x & 0x2) << 1) | ((x & 0x4) << 2) |
|
int pos = (x & 0x1) << 0 | ((x & 0x2) << 1) | ((x & 0x4) << 2) |
|
||||||
(y & 0x1) << 1 | ((y & 0x2) << 2) | ((y & 0x4) << 3);
|
(y & 0x1) << 1 | ((y & 0x2) << 2) | ((y & 0x4) << 3);
|
||||||
|
|
||||||
|
|
||||||
return ((x >> 3) << 6) + ((y >> 3) * ((width >> 3) << 6)) + pos;
|
return ((x >> 3) << 6) + ((y >> 3) * ((width >> 3) << 6)) + pos;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -217,7 +217,6 @@ static void d3d10_set_filtering(void* data, unsigned index, bool smooth)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void d3d10_gfx_set_rotation(void* data, unsigned rotation)
|
static void d3d10_gfx_set_rotation(void* data, unsigned rotation)
|
||||||
{
|
{
|
||||||
math_matrix_4x4 rot;
|
math_matrix_4x4 rot;
|
||||||
|
@ -50,7 +50,6 @@ static D3D11Device cached_device_d3d11;
|
|||||||
static D3D_FEATURE_LEVEL cached_supportedFeatureLevel;
|
static D3D_FEATURE_LEVEL cached_supportedFeatureLevel;
|
||||||
static D3D11DeviceContext cached_context;
|
static D3D11DeviceContext cached_context;
|
||||||
|
|
||||||
|
|
||||||
#ifdef HAVE_OVERLAY
|
#ifdef HAVE_OVERLAY
|
||||||
static void d3d11_free_overlays(d3d11_video_t* d3d11)
|
static void d3d11_free_overlays(d3d11_video_t* d3d11)
|
||||||
{
|
{
|
||||||
|
@ -166,7 +166,6 @@ static void d3d8_renderchain_set_vertices(
|
|||||||
vert[0].y = 1.0f;
|
vert[0].y = 1.0f;
|
||||||
vert[0].z = 1.0f;
|
vert[0].z = 1.0f;
|
||||||
|
|
||||||
|
|
||||||
vert[1].x = 1.0f;
|
vert[1].x = 1.0f;
|
||||||
vert[1].y = 1.0f;
|
vert[1].y = 1.0f;
|
||||||
vert[1].z = 1.0f;
|
vert[1].z = 1.0f;
|
||||||
@ -1004,7 +1003,6 @@ static bool d3d8_restore(void *data)
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void d3d8_set_nonblock_state(void *data, bool state)
|
static void d3d8_set_nonblock_state(void *data, bool state)
|
||||||
{
|
{
|
||||||
int interval = 0;
|
int interval = 0;
|
||||||
@ -1592,7 +1590,6 @@ static bool d3d8_frame(void *data, const void *frame,
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#ifdef HAVE_MENU
|
#ifdef HAVE_MENU
|
||||||
if (d3d->menu && d3d->menu->enabled)
|
if (d3d->menu && d3d->menu->enabled)
|
||||||
{
|
{
|
||||||
@ -1733,7 +1730,6 @@ static void d3d8_set_menu_texture_frame(void *data,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if (d3d->menu)
|
if (d3d->menu)
|
||||||
d3d8_unlock_rectangle(d3d->menu->tex);
|
d3d8_unlock_rectangle(d3d->menu->tex);
|
||||||
}
|
}
|
||||||
|
@ -1057,7 +1057,6 @@ static bool d3d9_restore(void *data)
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void d3d9_set_nonblock_state(void *data, bool state)
|
static void d3d9_set_nonblock_state(void *data, bool state)
|
||||||
{
|
{
|
||||||
int interval = 0;
|
int interval = 0;
|
||||||
@ -1665,7 +1664,6 @@ static bool d3d9_frame(void *data, const void *frame,
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#ifdef HAVE_MENU
|
#ifdef HAVE_MENU
|
||||||
if (d3d->menu && d3d->menu->enabled)
|
if (d3d->menu && d3d->menu->enabled)
|
||||||
{
|
{
|
||||||
@ -1889,7 +1887,6 @@ static void d3d9_set_menu_texture_frame(void *data,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if (d3d->menu)
|
if (d3d->menu)
|
||||||
d3d9_unlock_rectangle((LPDIRECT3DTEXTURE9)d3d->menu->tex);
|
d3d9_unlock_rectangle((LPDIRECT3DTEXTURE9)d3d->menu->tex);
|
||||||
}
|
}
|
||||||
|
@ -65,7 +65,6 @@ float snow(float2 pos, float time, float scale)
|
|||||||
return random_dots(pos / scale) * (scale * 0.5 + 0.5);
|
return random_dots(pos / scale) * (scale * 0.5 + 0.5);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
float4 PSMain(PSInput input) : SV_TARGET
|
float4 PSMain(PSInput input) : SV_TARGET
|
||||||
{
|
{
|
||||||
float tim = global.time * 0.4 * speed;
|
float tim = global.time * 0.4 * speed;
|
||||||
|
@ -65,7 +65,6 @@ float snow(float2 pos, float time, float scale)
|
|||||||
return random_dots(pos / scale) * (scale * 0.5 + 0.5);
|
return random_dots(pos / scale) * (scale * 0.5 + 0.5);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
float4 PSMain(PSInput input) : SV_TARGET
|
float4 PSMain(PSInput input) : SV_TARGET
|
||||||
{
|
{
|
||||||
float tim = global.time * 0.4 * speed;
|
float tim = global.time * 0.4 * speed;
|
||||||
|
@ -14,7 +14,6 @@ float4 VSMain(float4 position : POSITION, float2 texcoord : TEXCOORD0) : SV_POSI
|
|||||||
return mul(global.modelViewProj, position);
|
return mul(global.modelViewProj, position);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static const float atime = (global.time + 1.0) / 4.0;
|
static const float atime = (global.time + 1.0) / 4.0;
|
||||||
|
|
||||||
float rand(float2 co)
|
float rand(float2 co)
|
||||||
|
@ -83,5 +83,4 @@ SRC(
|
|||||||
return float4(input.color.rgb , input.color.a * t0.Sample(s0, input.texcoord).a);
|
return float4(input.color.rgb , input.color.a * t0.Sample(s0, input.texcoord).a);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
)
|
)
|
||||||
|
@ -336,8 +336,6 @@ static void drm_surface_update(void *data, const void *frame,
|
|||||||
drm_page_flip(surface);
|
drm_page_flip(surface);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
static uint32_t get_plane_prop_id(uint32_t obj_id, const char *name)
|
static uint32_t get_plane_prop_id(uint32_t obj_id, const char *name)
|
||||||
{
|
{
|
||||||
int i,j;
|
int i,j;
|
||||||
@ -626,7 +624,6 @@ static bool init_drm(void)
|
|||||||
else
|
else
|
||||||
RARCH_LOG ("DRM: UNIVERSAL PLANES cap set\n");
|
RARCH_LOG ("DRM: UNIVERSAL PLANES cap set\n");
|
||||||
|
|
||||||
|
|
||||||
ret = drmSetClientCap(drm.fd, DRM_CLIENT_CAP_ATOMIC, 1);
|
ret = drmSetClientCap(drm.fd, DRM_CLIENT_CAP_ATOMIC, 1);
|
||||||
if (ret)
|
if (ret)
|
||||||
{
|
{
|
||||||
@ -706,7 +703,6 @@ static bool init_drm(void)
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void *drm_gfx_init(const video_info_t *video,
|
static void *drm_gfx_init(const video_info_t *video,
|
||||||
const input_driver_t **input, void **input_data)
|
const input_driver_t **input, void **input_data)
|
||||||
{
|
{
|
||||||
|
@ -88,7 +88,6 @@ static const struct exynos_config_default
|
|||||||
{400, 240, EXYNOS_BUFFER_AUX, G2D_COLOR_FMT_ARGB4444 | G2D_ORDER_RGBAX, 2} /* menu */
|
{400, 240, EXYNOS_BUFFER_AUX, G2D_COLOR_FMT_ARGB4444 | G2D_ORDER_RGBAX, 2} /* menu */
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
struct exynos_data;
|
struct exynos_data;
|
||||||
|
|
||||||
#if (EXYNOS_GFX_DEBUG_PERF == 1)
|
#if (EXYNOS_GFX_DEBUG_PERF == 1)
|
||||||
@ -1043,7 +1042,6 @@ struct exynos_video
|
|||||||
bool aspect_changed;
|
bool aspect_changed;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
static int exynos_init_font(struct exynos_video *vid)
|
static int exynos_init_font(struct exynos_video *vid)
|
||||||
{
|
{
|
||||||
struct exynos_data *pdata = vid->data;
|
struct exynos_data *pdata = vid->data;
|
||||||
|
@ -128,7 +128,6 @@ void context_bind_hw_render(void *data, bool enable)
|
|||||||
gl_context_bind_hw_render(gl, enable);
|
gl_context_bind_hw_render(gl, enable);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#ifdef HAVE_OVERLAY
|
#ifdef HAVE_OVERLAY
|
||||||
static void gl_free_overlay(gl_t *gl)
|
static void gl_free_overlay(gl_t *gl)
|
||||||
{
|
{
|
||||||
@ -247,7 +246,6 @@ static void gl_render_overlay(gl_t *gl, video_frame_info_t *video_info)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
static void gl_set_projection(gl_t *gl,
|
static void gl_set_projection(gl_t *gl,
|
||||||
struct video_ortho *ortho, bool allow_rotate)
|
struct video_ortho *ortho, bool allow_rotate)
|
||||||
{
|
{
|
||||||
@ -688,7 +686,6 @@ static void gl_set_texture_frame(void *data,
|
|||||||
if (!gl->menu_texture)
|
if (!gl->menu_texture)
|
||||||
glGenTextures(1, &gl->menu_texture);
|
glGenTextures(1, &gl->menu_texture);
|
||||||
|
|
||||||
|
|
||||||
gl_load_texture_data(gl->menu_texture,
|
gl_load_texture_data(gl->menu_texture,
|
||||||
RARCH_WRAP_EDGE, menu_filter,
|
RARCH_WRAP_EDGE, menu_filter,
|
||||||
video_pixel_get_alignment(width * base_size),
|
video_pixel_get_alignment(width * base_size),
|
||||||
@ -940,7 +937,6 @@ static void gl_pbo_async_readback(gl_t *gl)
|
|||||||
gl->renderchain_driver->unbind_pbo(gl, gl->renderchain_data);
|
gl->renderchain_driver->unbind_pbo(gl, gl->renderchain_data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static bool gl_frame(void *data, const void *frame,
|
static bool gl_frame(void *data, const void *frame,
|
||||||
unsigned frame_width, unsigned frame_height,
|
unsigned frame_width, unsigned frame_height,
|
||||||
uint64_t frame_count,
|
uint64_t frame_count,
|
||||||
@ -1234,7 +1230,6 @@ static bool gl_frame(void *data, const void *frame,
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void gl_destroy_resources(gl_t *gl)
|
static void gl_destroy_resources(gl_t *gl)
|
||||||
{
|
{
|
||||||
if (gl)
|
if (gl)
|
||||||
@ -2357,8 +2352,6 @@ static bool gl_overlay_load(void *data,
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
static void gl_overlay_enable(void *data, bool state)
|
static void gl_overlay_enable(void *data, bool state)
|
||||||
{
|
{
|
||||||
gl_t *gl = (gl_t*)data;
|
gl_t *gl = (gl_t*)data;
|
||||||
@ -2395,7 +2388,6 @@ static void gl_overlay_set_alpha(void *data, unsigned image, float mod)
|
|||||||
color[12 + 3] = mod;
|
color[12 + 3] = mod;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static const video_overlay_interface_t gl_overlay_interface = {
|
static const video_overlay_interface_t gl_overlay_interface = {
|
||||||
gl_overlay_enable,
|
gl_overlay_enable,
|
||||||
gl_overlay_load,
|
gl_overlay_load,
|
||||||
@ -2413,7 +2405,6 @@ static void gl_get_overlay_interface(void *data,
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
static retro_proc_address_t gl_get_proc_address(void *data, const char *sym)
|
static retro_proc_address_t gl_get_proc_address(void *data, const char *sym)
|
||||||
{
|
{
|
||||||
gfx_ctx_proc_address_t proc_address;
|
gfx_ctx_proc_address_t proc_address;
|
||||||
@ -2458,7 +2449,6 @@ static void gl_set_aspect_ratio(void *data, unsigned aspect_ratio_idx)
|
|||||||
gl->should_resize = true;
|
gl->should_resize = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void gl_apply_state_changes(void *data)
|
static void gl_apply_state_changes(void *data)
|
||||||
{
|
{
|
||||||
gl_t *gl = (gl_t*)data;
|
gl_t *gl = (gl_t*)data;
|
||||||
@ -2467,7 +2457,6 @@ static void gl_apply_state_changes(void *data)
|
|||||||
gl->should_resize = true;
|
gl->should_resize = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void gl_get_video_output_size(void *data,
|
static void gl_get_video_output_size(void *data,
|
||||||
unsigned *width, unsigned *height)
|
unsigned *width, unsigned *height)
|
||||||
{
|
{
|
||||||
|
@ -43,7 +43,6 @@
|
|||||||
|
|
||||||
#include "../font_driver.h"
|
#include "../font_driver.h"
|
||||||
|
|
||||||
|
|
||||||
static const wiiu_render_mode_t wiiu_render_mode_map[] =
|
static const wiiu_render_mode_t wiiu_render_mode_map[] =
|
||||||
{
|
{
|
||||||
{0}, /* GX2_TV_SCAN_MODE_NONE */
|
{0}, /* GX2_TV_SCAN_MODE_NONE */
|
||||||
@ -484,7 +483,6 @@ static void gx2_overlay_vertex_geom(void *data, unsigned image,
|
|||||||
wiiu_video_t *gx2 = (wiiu_video_t *)data;
|
wiiu_video_t *gx2 = (wiiu_video_t *)data;
|
||||||
struct gx2_overlay_data *o = NULL;
|
struct gx2_overlay_data *o = NULL;
|
||||||
|
|
||||||
|
|
||||||
if (gx2)
|
if (gx2)
|
||||||
o = (struct gx2_overlay_data *)&gx2->overlay[image];
|
o = (struct gx2_overlay_data *)&gx2->overlay[image];
|
||||||
|
|
||||||
@ -668,7 +666,6 @@ static void wiiu_gfx_free(void *data)
|
|||||||
if (!wiiu)
|
if (!wiiu)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|
||||||
/* clear leftover image */
|
/* clear leftover image */
|
||||||
GX2ClearColor(&wiiu->color_buffer, 0.0f, 0.0f, 0.0f, 1.0f);
|
GX2ClearColor(&wiiu->color_buffer, 0.0f, 0.0f, 0.0f, 1.0f);
|
||||||
GX2CopyColorBufferToScanBuffer(&wiiu->color_buffer, GX2_SCAN_TARGET_DRC);
|
GX2CopyColorBufferToScanBuffer(&wiiu->color_buffer, GX2_SCAN_TARGET_DRC);
|
||||||
@ -817,8 +814,6 @@ static bool wiiu_init_frame_textures(wiiu_video_t *wiiu, unsigned width, unsigne
|
|||||||
if (!height)
|
if (!height)
|
||||||
height = wiiu->color_buffer.surface.height;
|
height = wiiu->color_buffer.surface.height;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
memset(&wiiu->pass[i].texture, 0, sizeof(wiiu->pass[i].texture));
|
memset(&wiiu->pass[i].texture, 0, sizeof(wiiu->pass[i].texture));
|
||||||
wiiu->pass[i].texture.surface.dim = GX2_SURFACE_DIM_TEXTURE_2D;
|
wiiu->pass[i].texture.surface.dim = GX2_SURFACE_DIM_TEXTURE_2D;
|
||||||
wiiu->pass[i].texture.surface.width = width;
|
wiiu->pass[i].texture.surface.width = width;
|
||||||
@ -837,7 +832,6 @@ static bool wiiu_init_frame_textures(wiiu_video_t *wiiu, unsigned width, unsigne
|
|||||||
GX2CalcSurfaceSizeAndAlignment(&wiiu->pass[i].texture.surface);
|
GX2CalcSurfaceSizeAndAlignment(&wiiu->pass[i].texture.surface);
|
||||||
GX2InitTextureRegs(&wiiu->pass[i].texture);
|
GX2InitTextureRegs(&wiiu->pass[i].texture);
|
||||||
|
|
||||||
|
|
||||||
if ((i != (wiiu->shader_preset->passes - 1)) || (width != wiiu->vp.width)
|
if ((i != (wiiu->shader_preset->passes - 1)) || (width != wiiu->vp.width)
|
||||||
|| (height != wiiu->vp.height))
|
|| (height != wiiu->vp.height))
|
||||||
{
|
{
|
||||||
@ -1001,7 +995,6 @@ static void wiiu_gfx_update_uniform_block(wiiu_video_t *wiiu, int pass, float *u
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
for (int k = 0; k < wiiu->shader_preset->num_parameters; k++)
|
for (int k = 0; k < wiiu->shader_preset->num_parameters; k++)
|
||||||
{
|
{
|
||||||
if (string_is_equal(id, wiiu->shader_preset->parameters[k].id))
|
if (string_is_equal(id, wiiu->shader_preset->parameters[k].id))
|
||||||
@ -1128,7 +1121,6 @@ static bool wiiu_gfx_frame(void *data, const void *frame,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
GX2Invalidate(GX2_INVALIDATE_MODE_CPU_TEXTURE, wiiu->texture.surface.image,
|
GX2Invalidate(GX2_INVALIDATE_MODE_CPU_TEXTURE, wiiu->texture.surface.image,
|
||||||
wiiu->texture.surface.imageSize);
|
wiiu->texture.surface.imageSize);
|
||||||
|
|
||||||
@ -1240,8 +1232,6 @@ static bool wiiu_gfx_frame(void *data, const void *frame,
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
for (int k = 0; k < wiiu->shader_preset->luts; k++)
|
for (int k = 0; k < wiiu->shader_preset->luts; k++)
|
||||||
{
|
{
|
||||||
if (wiiu->luts[k].surface.image
|
if (wiiu->luts[k].surface.image
|
||||||
@ -1528,7 +1518,6 @@ static bool wiiu_gfx_set_shader(void *data,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -1543,7 +1532,6 @@ static struct video_shader *wiiu_gfx_get_current_shader(void *data)
|
|||||||
return wiiu->shader_preset;
|
return wiiu->shader_preset;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void wiiu_gfx_set_rotation(void *data,
|
static void wiiu_gfx_set_rotation(void *data,
|
||||||
unsigned rotation)
|
unsigned rotation)
|
||||||
{
|
{
|
||||||
@ -1626,7 +1614,6 @@ static void wiiu_gfx_set_filtering(void *data, unsigned index, bool smooth)
|
|||||||
wiiu->smooth = smooth;
|
wiiu->smooth = smooth;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void wiiu_gfx_apply_state_changes(void *data)
|
static void wiiu_gfx_apply_state_changes(void *data)
|
||||||
{
|
{
|
||||||
wiiu_video_t *wiiu = (wiiu_video_t *)data;
|
wiiu_video_t *wiiu = (wiiu_video_t *)data;
|
||||||
|
@ -62,7 +62,6 @@ static struct
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
__attribute__((aligned(GX2_SHADER_ALIGNMENT)))
|
__attribute__((aligned(GX2_SHADER_ALIGNMENT)))
|
||||||
static struct
|
static struct
|
||||||
{
|
{
|
||||||
@ -739,7 +738,6 @@ static GX2UniformVar uniform_vars[] = {
|
|||||||
{"global.time", GX2_SHADER_VAR_TYPE_FLOAT, 1, 20, 0},
|
{"global.time", GX2_SHADER_VAR_TYPE_FLOAT, 1, 20, 0},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
GX2Shader bokeh_shader =
|
GX2Shader bokeh_shader =
|
||||||
{
|
{
|
||||||
{
|
{
|
||||||
|
@ -105,7 +105,6 @@ static GX2UniformVar uniform_vars[] = {
|
|||||||
{"global.MVP", GX2_SHADER_VAR_TYPE_MATRIX4X4, 1, 0, 0},
|
{"global.MVP", GX2_SHADER_VAR_TYPE_MATRIX4X4, 1, 0, 0},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
GX2Shader frame_shader =
|
GX2Shader frame_shader =
|
||||||
{
|
{
|
||||||
{
|
{
|
||||||
|
@ -30,7 +30,6 @@ __attribute__((aligned (16)))
|
|||||||
float time;
|
float time;
|
||||||
}menu_shader_uniform_t;
|
}menu_shader_uniform_t;
|
||||||
|
|
||||||
|
|
||||||
extern GX2Shader ribbon_shader;
|
extern GX2Shader ribbon_shader;
|
||||||
extern GX2Shader ribbon_simple_shader;
|
extern GX2Shader ribbon_simple_shader;
|
||||||
extern GX2Shader snow_simple_shader;
|
extern GX2Shader snow_simple_shader;
|
||||||
|
@ -331,7 +331,6 @@ static GX2UniformVar uniform_vars[] = {
|
|||||||
{"constants.time", GX2_SHADER_VAR_TYPE_FLOAT, 1, 0, 0},
|
{"constants.time", GX2_SHADER_VAR_TYPE_FLOAT, 1, 0, 0},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
GX2Shader ribbon_shader =
|
GX2Shader ribbon_shader =
|
||||||
{
|
{
|
||||||
{
|
{
|
||||||
|
@ -217,7 +217,6 @@ static GX2UniformVar uniform_vars[] = {
|
|||||||
{"global.time", GX2_SHADER_VAR_TYPE_FLOAT, 1, 20, 0},
|
{"global.time", GX2_SHADER_VAR_TYPE_FLOAT, 1, 20, 0},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
GX2Shader ribbon_simple_shader =
|
GX2Shader ribbon_simple_shader =
|
||||||
{
|
{
|
||||||
{
|
{
|
||||||
|
@ -62,7 +62,6 @@ static struct
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
__attribute__((aligned(GX2_SHADER_ALIGNMENT)))
|
__attribute__((aligned(GX2_SHADER_ALIGNMENT)))
|
||||||
static struct
|
static struct
|
||||||
{
|
{
|
||||||
@ -1404,7 +1403,6 @@ static GX2UniformVar uniform_vars[] = {
|
|||||||
{"global.time", GX2_SHADER_VAR_TYPE_FLOAT, 1, 20, 0},
|
{"global.time", GX2_SHADER_VAR_TYPE_FLOAT, 1, 20, 0},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
GX2Shader snow_shader =
|
GX2Shader snow_shader =
|
||||||
{
|
{
|
||||||
{
|
{
|
||||||
|
@ -1374,7 +1374,6 @@ static struct
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
static GX2AttribVar attributes[] =
|
static GX2AttribVar attributes[] =
|
||||||
{
|
{
|
||||||
{ "Position", GX2_SHADER_VAR_TYPE_FLOAT4, 0, 0},
|
{ "Position", GX2_SHADER_VAR_TYPE_FLOAT4, 0, 0},
|
||||||
@ -1404,7 +1403,6 @@ static GX2UniformVar uniform_vars[] = {
|
|||||||
{"global.time", GX2_SHADER_VAR_TYPE_FLOAT, 1, 20, 0},
|
{"global.time", GX2_SHADER_VAR_TYPE_FLOAT, 1, 20, 0},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
GX2Shader snow_simple_shader =
|
GX2Shader snow_simple_shader =
|
||||||
{
|
{
|
||||||
{
|
{
|
||||||
|
@ -20,7 +20,6 @@
|
|||||||
#include "gx2_shader_inl.h"
|
#include "gx2_shader_inl.h"
|
||||||
#include "menu_shaders.h"
|
#include "menu_shaders.h"
|
||||||
|
|
||||||
|
|
||||||
__attribute__((aligned(GX2_SHADER_ALIGNMENT)))
|
__attribute__((aligned(GX2_SHADER_ALIGNMENT)))
|
||||||
static struct
|
static struct
|
||||||
{
|
{
|
||||||
@ -555,7 +554,6 @@ static struct
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
static GX2AttribVar attributes[] =
|
static GX2AttribVar attributes[] =
|
||||||
{
|
{
|
||||||
{ "Position", GX2_SHADER_VAR_TYPE_FLOAT4, 0, 0},
|
{ "Position", GX2_SHADER_VAR_TYPE_FLOAT4, 0, 0},
|
||||||
@ -585,7 +583,6 @@ static GX2UniformVar uniform_vars[] = {
|
|||||||
{"global.time", GX2_SHADER_VAR_TYPE_FLOAT, 1, 20, 0},
|
{"global.time", GX2_SHADER_VAR_TYPE_FLOAT, 1, 20, 0},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
GX2Shader snowflake_shader =
|
GX2Shader snowflake_shader =
|
||||||
{
|
{
|
||||||
{
|
{
|
||||||
|
@ -223,7 +223,6 @@ static GX2UniformBlock uniform_blocks[] =
|
|||||||
{"UBO_tex", 2, sizeof(GX2_vec2)},
|
{"UBO_tex", 2, sizeof(GX2_vec2)},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
static GX2UniformVar uniform_vars[] =
|
static GX2UniformVar uniform_vars[] =
|
||||||
{
|
{
|
||||||
{"vp_size", GX2_SHADER_VAR_TYPE_FLOAT2, 1, 0, 0},
|
{"vp_size", GX2_SHADER_VAR_TYPE_FLOAT2, 1, 0, 0},
|
||||||
|
@ -1540,7 +1540,6 @@ static bool gx_frame(void *data, const void *frame,
|
|||||||
g_draw_done = false;
|
g_draw_done = false;
|
||||||
g_current_framebuf ^= 1;
|
g_current_framebuf ^= 1;
|
||||||
|
|
||||||
|
|
||||||
if (frame)
|
if (frame)
|
||||||
{
|
{
|
||||||
if (gx->rgb32)
|
if (gx->rgb32)
|
||||||
|
@ -90,7 +90,6 @@ typedef struct omapfb_data
|
|||||||
bool sync;
|
bool sync;
|
||||||
} omapfb_data_t;
|
} omapfb_data_t;
|
||||||
|
|
||||||
|
|
||||||
static const char *omapfb_get_fb_device(void)
|
static const char *omapfb_get_fb_device(void)
|
||||||
{
|
{
|
||||||
static char fbname[12] = {0};
|
static char fbname[12] = {0};
|
||||||
@ -786,7 +785,6 @@ static void omapfb_blit_frame(omapfb_data_t *pdata, const void *src,
|
|||||||
memcpy(dst + dst_pitch * i, src + src_pitch * i, dst_pitch);
|
memcpy(dst + dst_pitch * i, src + src_pitch * i, dst_pitch);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
typedef struct omap_video
|
typedef struct omap_video
|
||||||
{
|
{
|
||||||
omapfb_data_t *omap;
|
omapfb_data_t *omap;
|
||||||
@ -809,7 +807,6 @@ typedef struct omap_video
|
|||||||
} menu;
|
} menu;
|
||||||
} omap_video_t;
|
} omap_video_t;
|
||||||
|
|
||||||
|
|
||||||
static void omap_gfx_free(void *data)
|
static void omap_gfx_free(void *data)
|
||||||
{
|
{
|
||||||
omap_video_t *vid = data;
|
omap_video_t *vid = data;
|
||||||
|
@ -182,7 +182,6 @@ static void prim_texture(GSGLOBAL *gsGlobal, GSTEXTURE *texture, int zPosition,
|
|||||||
GS_TEXT);
|
GS_TEXT);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void *ps2_gfx_init(const video_info_t *video,
|
static void *ps2_gfx_init(const video_info_t *video,
|
||||||
const input_driver_t **input, void **input_data)
|
const input_driver_t **input, void **input_data)
|
||||||
{
|
{
|
||||||
@ -415,7 +414,6 @@ static const video_poke_interface_t ps2_poke_interface = {
|
|||||||
NULL /* get_hw_render_interface */
|
NULL /* get_hw_render_interface */
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
static void ps2_gfx_get_poke_interface(void *data,
|
static void ps2_gfx_get_poke_interface(void *data,
|
||||||
const video_poke_interface_t **iface)
|
const video_poke_interface_t **iface)
|
||||||
{
|
{
|
||||||
|
@ -943,7 +943,6 @@ static bool psp_read_viewport(void *data, uint8_t *buffer, bool is_idle)
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -421,7 +421,6 @@ static void *sdl2_gfx_init(const video_info_t *video,
|
|||||||
if (!video->fullscreen)
|
if (!video->fullscreen)
|
||||||
RARCH_LOG("[SDL]: Creating window @ %ux%u\n", video->width, video->height);
|
RARCH_LOG("[SDL]: Creating window @ %ux%u\n", video->width, video->height);
|
||||||
|
|
||||||
|
|
||||||
if (video->fullscreen)
|
if (video->fullscreen)
|
||||||
flags = settings->bools.video_windowed_fullscreen ? SDL_WINDOW_FULLSCREEN_DESKTOP : SDL_WINDOW_FULLSCREEN;
|
flags = settings->bools.video_windowed_fullscreen ? SDL_WINDOW_FULLSCREEN_DESKTOP : SDL_WINDOW_FULLSCREEN;
|
||||||
else
|
else
|
||||||
|
@ -500,7 +500,6 @@ static void sdl_set_texture_enable(void *data, bool state, bool full_screen)
|
|||||||
vid->menu.active = state;
|
vid->menu.active = state;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void sdl_show_mouse(void *data, bool state)
|
static void sdl_show_mouse(void *data, bool state)
|
||||||
{
|
{
|
||||||
(void)data;
|
(void)data;
|
||||||
|
@ -92,7 +92,6 @@ static void *vita2d_gfx_init(const video_info_t *video,
|
|||||||
video_driver_set_size(&temp_width, &temp_height);
|
video_driver_set_size(&temp_width, &temp_height);
|
||||||
vita2d_gfx_set_viewport(vita, temp_width, temp_height, false, true);
|
vita2d_gfx_set_viewport(vita, temp_width, temp_height, false, true);
|
||||||
|
|
||||||
|
|
||||||
if (input && input_data)
|
if (input && input_data)
|
||||||
{
|
{
|
||||||
settings_t *settings = config_get_ptr();
|
settings_t *settings = config_get_ptr();
|
||||||
|
@ -137,7 +137,6 @@ static void *xenon360_gfx_init(const video_info_t *video, const input_driver_t *
|
|||||||
|
|
||||||
edram_init(gl->gl_device);
|
edram_init(gl->gl_device);
|
||||||
|
|
||||||
|
|
||||||
/* enable filtering for now */
|
/* enable filtering for now */
|
||||||
|
|
||||||
float x = -1.0f;
|
float x = -1.0f;
|
||||||
|
@ -536,7 +536,6 @@ static void android_gfx_ctx_set_swap_interval(void *data, int swap_interval)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static gfx_ctx_proc_t android_gfx_ctx_get_proc_address(const char *symbol)
|
static gfx_ctx_proc_t android_gfx_ctx_get_proc_address(const char *symbol)
|
||||||
{
|
{
|
||||||
switch (android_api)
|
switch (android_api)
|
||||||
|
@ -154,7 +154,6 @@ static void gfx_ctx_drm_check_window(void *data, bool *quit,
|
|||||||
*quit = (bool)frontend_driver_get_signal_handler_state();
|
*quit = (bool)frontend_driver_get_signal_handler_state();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void drm_flip_handler(int fd, unsigned frame,
|
static void drm_flip_handler(int fd, unsigned frame,
|
||||||
unsigned sec, unsigned usec, void *data)
|
unsigned sec, unsigned usec, void *data)
|
||||||
{
|
{
|
||||||
@ -707,7 +706,6 @@ static bool gfx_ctx_drm_set_video_mode(void *data,
|
|||||||
goto error;
|
goto error;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
switch (drm_api)
|
switch (drm_api)
|
||||||
{
|
{
|
||||||
case GFX_CTX_OPENGL_API:
|
case GFX_CTX_OPENGL_API:
|
||||||
@ -746,7 +744,6 @@ error:
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void gfx_ctx_drm_destroy(void *data)
|
static void gfx_ctx_drm_destroy(void *data)
|
||||||
{
|
{
|
||||||
gfx_ctx_drm_data_t *drm = (gfx_ctx_drm_data_t*)data;
|
gfx_ctx_drm_data_t *drm = (gfx_ctx_drm_data_t*)data;
|
||||||
|
@ -280,7 +280,6 @@ static bool gfx_ctx_emscripten_bind_api(void *data,
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void gfx_ctx_emscripten_input_driver(void *data,
|
static void gfx_ctx_emscripten_input_driver(void *data,
|
||||||
const char *name,
|
const char *name,
|
||||||
const input_driver_t **input, void **input_data)
|
const input_driver_t **input, void **input_data)
|
||||||
|
@ -229,7 +229,6 @@ error:
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void gfx_ctx_gdi_input_driver(void *data,
|
static void gfx_ctx_gdi_input_driver(void *data,
|
||||||
const char *joypad_name,
|
const char *joypad_name,
|
||||||
const input_driver_t **input, void **input_data)
|
const input_driver_t **input, void **input_data)
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user