Skip to content

Commit 75abd1f

Browse files
RetroSvenRetroSven
committed
Merge remote-tracking branch 'upstream/master'
2 parents b8ab6c1 + f16ec70 commit 75abd1f

File tree

506 files changed

+31821
-46810
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

506 files changed

+31821
-46810
lines changed

‎AUTHORS.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ Fabio Ritrovato (Sephiroth87)
9292
Fayne Aldan (FayneAldan)
9393
FIX94
9494
Flame Sage (chris062689)
95+
flyinghead
9596
Francisco José García García (frangarcj)
9697
GameDragon2k
9798
Garrett Brown (garbear)
@@ -124,6 +125,7 @@ Jay McCarthy (jeapostrophe)
124125
Jean-André Santoni (kivutar)
125126
Jean-Paul Mari (djipi)
126127
Jean-Sébastien Guay (Skylark13)
128+
Jesse Bryan (winneon)
127129
Joel (joel16)
128130
Joerg Sonnenberger (jsonn)
129131
Johannes Schickel (lordhoto)
@@ -260,6 +262,7 @@ Vladimir Panteleev (CyberShadow)
260262
Víctor "IlDucci" (IlDucci)
261263
Wang Vincent (susemm)
262264
webgeek1234
265+
Wiktor Strzębała (wiktorek140)
263266
xhp-creations
264267
Yarsan Hoessain (hyarsan)
265268
Yongwoon Cho (ssangkong)

‎CHANGES.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@
2121
- MENU/QT/WIMP: Initial grid view.
2222
- MENU/QT/WIMP: Drag&drop to add new playlist items, add option to add/edit/delete playlists.
2323
- MENU/QT/WIMP: Add menu option to update RetroArch (Windows only for now).
24+
- MENU/QT/WIMP: Add menu option to manage shaders.
25+
- MENU/QT/WIMP: Add menu option to manage core options.
26+
- MENU/XMB: Add new icons for the settings
27+
- MENU/XMB: Add an option to show the desktop ui
2428
- METAL: Initial work-in-progress video driver for Metal. macOS-only right now, and currently requires macOS 10.13.
2529
- METAL: Supports XMB/MaterialUI, has a menu display driver. Has a font rendering driver.
2630
- METAL/SLANG: Slang shaders should be compatible with Metal video driver.
@@ -91,7 +95,7 @@ video drivers that implement it (D3D8/9/10/11/12/GL)
9195
- MENU/RGUI: D3D8/D3D9: Hookup Menu Linear Filter
9296
- MENU/XMB: Disable XMB shadow icons by default for PowerPC and ARM for performance reasons.
9397
- MENU/XMB: Left/right thumbnails are now automatically scaled according to layout.
94-
- MENU/XMB: Add Left Thumbnails (additional to the right).
98+
- MENU/XMB: Add Left Thumbnails (additional to the right).
9599
- MENU/XMB: Fixed left/right tab regression.
96100
- MENU/XMB: Fix scaling of tall images that were cut on bottom previously.
97101
- MENU/XMB: Menu scale factor setting now changes texts length, image scaling and margins.

‎Makefile.common

Lines changed: 29 additions & 155 deletions
Original file line numberDiff line numberDiff line change
@@ -332,18 +332,40 @@ endif
332332

333333
# Qt WIMP GUI
334334

335+
ifeq ($(HAVE_OPENSSL), 1)
336+
DEFINES += $(OPENSSL_CFLAGS)
337+
LIBS += $(OPENSSL_LIBS)
338+
endif
339+
335340
ifeq ($(HAVE_QT), 1)
336341
OBJ += ui/drivers/ui_qt.o \
337342
ui/drivers/qt/ui_qt_application.o \
338343
ui/drivers/qt/ui_qt_window.o \
339344
ui/drivers/qt/ui_qt_browser_window.o \
340345
ui/drivers/qt/ui_qt_load_core_window.o \
341346
ui/drivers/qt/ui_qt_msg_window.o \
342-
ui/drivers/qt/flowlayout.o
347+
ui/drivers/qt/flowlayout.o \
348+
ui/drivers/qt/shaderparamsdialog.o \
349+
ui/drivers/qt/coreoptionsdialog.o \
350+
ui/drivers/qt/filedropwidget.o \
351+
ui/drivers/qt/coreinfodialog.o \
352+
ui/drivers/qt/playlistentrydialog.o \
353+
ui/drivers/qt/viewoptionsdialog.o \
354+
ui/drivers/qt/playlist.o \
355+
ui/drivers/qt/updateretroarch.o \
356+
ui/drivers/qt/thumbnaildownload.o \
357+
ui/drivers/qt/thumbnailpackdownload.o \
358+
ui/drivers/qt/playlistthumbnaildownload.o
343359

344360
MOC_HEADERS += ui/drivers/ui_qt.h \
345361
ui/drivers/qt/ui_qt_load_core_window.h \
346-
ui/drivers/qt/flowlayout.h
362+
ui/drivers/qt/flowlayout.h \
363+
ui/drivers/qt/shaderparamsdialog.h \
364+
ui/drivers/qt/coreoptionsdialog.h \
365+
ui/drivers/qt/filedropwidget.h \
366+
ui/drivers/qt/coreinfodialog.h \
367+
ui/drivers/qt/playlistentrydialog.h \
368+
ui/drivers/qt/viewoptionsdialog.h
347369

348370
DEFINES += $(QT5CORE_CFLAGS) $(QT5GUI_CFLAGS) $(QT5WIDGETS_CFLAGS) $(QT5CONCURRENT_CFLAGS) $(QT5NETWORK_CFLAGS) -DHAVE_MAIN
349371
#DEFINES += $(QT5WEBENGINE_CFLAGS)
@@ -374,7 +396,6 @@ OBJ += libretro-db/bintree.o \
374396
endif
375397

376398
ifneq ($(C89_BUILD), 1)
377-
HAVE_LIBUI = 0
378399
HAVE_GTKPLUS = 0
379400

380401
ifeq ($(HAVE_SSL), 1)
@@ -463,157 +484,6 @@ OBJS_TLS = deps/mbedtls/debug.o \
463484

464485
OBJ += $(OBJS_TLS_CRYPTO) $(OBJS_TLS_X509) $(OBJS_TLS)
465486
endif
466-
467-
ifeq ($(HAVE_LIBUI), 1)
468-
DEFINES += -DHAVE_LIBUI
469-
ifneq ($(findstring Win32,$(OS)),)
470-
OBJ += deps/libui/windows/alloc.o \
471-
deps/libui/windows/area.o \
472-
deps/libui/windows/areadraw.o \
473-
deps/libui/windows/areaevents.o \
474-
deps/libui/windows/areascroll.o \
475-
deps/libui/windows/areautil.o \
476-
deps/libui/windows/box.o \
477-
deps/libui/windows/button.o \
478-
deps/libui/windows/checkbox.o \
479-
deps/libui/windows/colorbutton.o \
480-
deps/libui/windows/colordialog.o \
481-
deps/libui/windows/combobox.o \
482-
deps/libui/windows/container.o \
483-
deps/libui/windows/control.o \
484-
deps/libui/windows/d2dscratch.o \
485-
deps/libui/windows/datetimepicker.o \
486-
deps/libui/windows/debug.o \
487-
deps/libui/windows/draw.o \
488-
deps/libui/windows/drawmatrix.o \
489-
deps/libui/windows/drawpath.o \
490-
deps/libui/windows/drawtext.o \
491-
deps/libui/windows/dwrite.o \
492-
deps/libui/windows/editablecombo.o \
493-
deps/libui/windows/entry.o \
494-
deps/libui/windows/events.o \
495-
deps/libui/windows/fontbutton.o \
496-
deps/libui/windows/fontdialog.o \
497-
deps/libui/windows/form.o \
498-
deps/libui/windows/graphemes.o \
499-
deps/libui/windows/grid.o \
500-
deps/libui/windows/group.o \
501-
deps/libui/windows/init.o \
502-
deps/libui/windows/label.o \
503-
deps/libui/windows/main.o \
504-
deps/libui/windows/menu.o \
505-
deps/libui/windows/multilineentry.o \
506-
deps/libui/windows/parent.o \
507-
deps/libui/windows/progressbar.o \
508-
deps/libui/windows/radiobuttons.o \
509-
deps/libui/windows/separator.o \
510-
deps/libui/windows/sizing.o \
511-
deps/libui/windows/slider.o \
512-
deps/libui/windows/spinbox.o \
513-
deps/libui/windows/stddialogs.o \
514-
deps/libui/windows/tab.o \
515-
deps/libui/windows/tabpage.o \
516-
deps/libui/windows/text.o \
517-
deps/libui/windows/utf16.o \
518-
deps/libui/windows/utilwin.o \
519-
deps/libui/windows/window.o \
520-
deps/libui/windows/winpublic.o \
521-
deps/libui/windows/winutil.o
522-
LIBS += -luxtheme -ld2d1 -ldwrite -lusp10
523-
else
524-
ifneq ($(findstring Darwin,$(OS)),)
525-
OBJ += deps/libui/darwin/alloc.o \
526-
deps/libui/darwin/area.o \
527-
deps/libui/darwin/areaevents.o \
528-
deps/libui/darwin/autolayout.o \
529-
deps/libui/darwin/box.o \
530-
deps/libui/darwin/button.o \
531-
deps/libui/darwin/checkbox.o \
532-
deps/libui/darwin/colorbutton.o \
533-
deps/libui/darwin/combobox.o \
534-
deps/libui/darwin/control.o \
535-
deps/libui/darwin/datetimepicker.o \
536-
deps/libui/darwin/debug.o \
537-
deps/libui/darwin/draw.o \
538-
deps/libui/darwin/drawtext.o \
539-
deps/libui/darwin/editablecombo.o \
540-
deps/libui/darwin/entry.o \
541-
deps/libui/darwin/fontbutton.o \
542-
deps/libui/darwin/form.o \
543-
deps/libui/darwin/grid.o \
544-
deps/libui/darwin/group.o \
545-
deps/libui/darwin/image.o \
546-
deps/libui/darwin/label.o \
547-
deps/libui/darwin/main.o \
548-
deps/libui/darwin/map.o \
549-
deps/libui/darwin/menu.o \
550-
deps/libui/darwin/multilineentry.o \
551-
deps/libui/darwin/progressbar.o \
552-
deps/libui/darwin/radiobuttons.o \
553-
deps/libui/darwin/scrollview.o \
554-
deps/libui/darwin/separator.o \
555-
deps/libui/darwin/slider.o \
556-
deps/libui/darwin/spinbox.o \
557-
deps/libui/darwin/stddialogs.o \
558-
deps/libui/darwin/tab.o \
559-
deps/libui/darwin/text.o \
560-
deps/libui/darwin/util.o \
561-
deps/libui/darwin/window.o \
562-
deps/libui/darwin/winmoveresize.o
563-
else
564-
CFLAGS += -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0
565-
LIBS += -lgtk-3 -lgdk-3 -lpangocairo-1.0 -lpango-1.0 -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0
566-
OBJ += deps/libui/unix/alloc.o \
567-
deps/libui/unix/area.o \
568-
deps/libui/unix/box.o \
569-
deps/libui/unix/button.o \
570-
deps/libui/unix/cellrendererbutton.o \
571-
deps/libui/unix/checkbox.o \
572-
deps/libui/unix/child.o \
573-
deps/libui/unix/colorbutton.o \
574-
deps/libui/unix/combobox.o \
575-
deps/libui/unix/control.o \
576-
deps/libui/unix/datetimepicker.o \
577-
deps/libui/unix/debug.o \
578-
deps/libui/unix/draw.o \
579-
deps/libui/unix/drawmatrix.o \
580-
deps/libui/unix/drawpath.o \
581-
deps/libui/unix/drawtext.o \
582-
deps/libui/unix/editablecombo.o \
583-
deps/libui/unix/entry.o \
584-
deps/libui/unix/fontbutton.o \
585-
deps/libui/unix/form.o \
586-
deps/libui/unix/future.o \
587-
deps/libui/unix/graphemes.o \
588-
deps/libui/unix/grid.o \
589-
deps/libui/unix/group.o \
590-
deps/libui/unix/image.o \
591-
deps/libui/unix/label.o \
592-
deps/libui/unix/main.o \
593-
deps/libui/unix/menu.o \
594-
deps/libui/unix/multilineentry.o \
595-
deps/libui/unix/progressbar.o \
596-
deps/libui/unix/radiobuttons.o \
597-
deps/libui/unix/separator.o \
598-
deps/libui/unix/slider.o \
599-
deps/libui/unix/spinbox.o \
600-
deps/libui/unix/stddialogs.o \
601-
deps/libui/unix/tab.o \
602-
deps/libui/unix/text.o \
603-
deps/libui/unix/util.o \
604-
deps/libui/unix/window.o
605-
endif
606-
endif
607-
608-
OBJ += deps/libui/common/areaevents.o \
609-
deps/libui/common/control.o \
610-
deps/libui/common/debug.o \
611-
deps/libui/common/matrix.o \
612-
deps/libui/common/shouldquit.o \
613-
deps/libui/common/userbugs.o
614-
615-
OBJ += deps/libui/libui_main.o
616-
endif
617487
endif
618488

619489
# Miscellaneous
@@ -960,6 +830,9 @@ endif
960830
ifeq ($(HAVE_WAYLAND), 1)
961831
OBJ += gfx/drivers_context/wayland_ctx.o \
962832
input/drivers/wayland_input.o
833+
ifeq ($(HAVE_EGL), 1)
834+
LIBS += $(EGL_LIBS)
835+
endif
963836
DEFINES += $(WAYLAND_CFLAGS) $(WAYLAND_CURSOR_CFLAGS)
964837
LIBS += $(WAYLAND_LIBS) $(WAYLAND_CURSOR_LIBS)
965838
endif
@@ -1278,7 +1151,7 @@ ifeq ($(HAVE_VULKAN), 1)
12781151
CXXFLAGS += -fpermissive
12791152
endif
12801153

1281-
CXXFLAGS += -Wno-switch -Wno-sign-compare -fno-strict-aliasing -Wno-maybe-uninitialized -Wno-reorder -Wno-parentheses
1154+
CXXFLAGS += -Wno-switch -Wno-sign-compare -fno-strict-aliasing -Wno-reorder -Wno-parentheses
12821155

12831156
OBJ += gfx/drivers/vulkan.o \
12841157
gfx/common/vulkan_common.o \
@@ -1732,6 +1605,7 @@ ifeq ($(HAVE_NETWORKING), 1)
17321605
endif
17331606

17341607
ifeq ($(HAVE_DISCORD), 1)
1608+
NEED_CXX_LINKER = 1
17351609
DEFINES += -DHAVE_DISCORD
17361610
DEFINES += -Ideps/discord-rpc/include/ -Ideps/discord-rpc/thirdparty/rapidjson-1.1.0/include/
17371611
OBJ += deps/discord-rpc/src/discord_rpc.o \

‎Makefile.psp1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ TARGET = retroarchpsp
1313
ifeq ($(DEBUG), 1)
1414
OPTIMIZE_LV := -O0 -g
1515
else
16-
OPTIMIZE_LV := -O2
16+
OPTIMIZE_LV := -O3
1717
endif
1818

1919
ifeq ($(WHOLE_ARCHIVE_LINK), 1)
@@ -22,7 +22,7 @@ ifeq ($(WHOLE_ARCHIVE_LINK), 1)
2222
endif
2323

2424
INCDIR = deps deps/stb deps/libz deps/7zip deps/pthreads deps/pthreads/platform/psp deps/pthreads/platform/helper libretro-common/include
25-
CFLAGS = $(OPTIMIZE_LV) -G0 -std=gnu99 -ffast-math
25+
CFLAGS = $(OPTIMIZE_LV) -G0 -std=gnu99 -ffast-math -fsingle-precision-constant
2626
ASFLAGS = $(CFLAGS)
2727

2828
RARCH_DEFINES = -DPSP -D_MIPS_ARCH_ALLEGREX -DHAVE_LANGEXTRA -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DWANT_ZLIB -DHAVE_GRIFFIN=1 -DRARCH_INTERNAL -DRARCH_CONSOLE -DHAVE_MENU -DHAVE_RGUI -DHAVE_FILTERS_BUILTIN -DHAVE_7ZIP -DHAVE_CC_RESAMPLER

‎audio/drivers/dsound.c

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@
3232
#include <retro_inline.h>
3333
#include <retro_miscellaneous.h>
3434
#include <retro_timers.h>
35+
#ifdef HAVE_THREADS
3536
#include <rthreads/rthreads.h>
37+
#endif
3638
#include <queues/fifo_queue.h>
3739

3840
#include "../audio_driver.h"
@@ -59,7 +61,11 @@ typedef struct dsound
5961
CRITICAL_SECTION crit;
6062

6163
HANDLE event;
64+
#ifdef HAVE_THREADS
6265
sthread_t *thread;
66+
#else
67+
HANDLE thread;
68+
#endif
6369

6470
unsigned buffer_size;
6571

@@ -137,7 +143,11 @@ static INLINE void release_region(dsound_t *ds, const struct audio_lock *region)
137143
region->size1, region->chunk2, region->size2);
138144
}
139145

146+
#ifdef HAVE_THREADS
140147
static void dsound_thread(void *data)
148+
#else
149+
static DWORD CALLBACK dsound_thread(PVOID data)
150+
#endif
141151
{
142152
DWORD write_ptr;
143153
dsound_t *ds = (dsound_t*)data;
@@ -219,7 +229,13 @@ static void dsound_stop_thread(dsound_t *ds)
219229

220230
ds->thread_alive = false;
221231

232+
#ifdef HAVE_THREADS
222233
sthread_join(ds->thread);
234+
#else
235+
WaitForSingleObject(ds->thread, INFINITE);
236+
CloseHandle(ds->thread);
237+
#endif
238+
223239
ds->thread = NULL;
224240
}
225241

@@ -228,7 +244,12 @@ static bool dsound_start_thread(dsound_t *ds)
228244
if (!ds->thread)
229245
{
230246
ds->thread_alive = true;
231-
ds->thread = sthread_create(dsound_thread, ds);
247+
248+
#ifdef HAVE_THREADS
249+
ds->thread = sthread_create(dsound_thread, ds);
250+
#else
251+
ds->thread = CreateThread(NULL, 0, dsound_thread, ds, 0, NULL);
252+
#endif
232253
if (!ds->thread)
233254
return false;
234255
}
@@ -261,7 +282,12 @@ static void dsound_free(void *data)
261282
if (ds->thread)
262283
{
263284
ds->thread_alive = false;
285+
#ifdef HAVE_THREADS
264286
sthread_join(ds->thread);
287+
#else
288+
WaitForSingleObject(ds->thread, INFINITE);
289+
CloseHandle(ds->thread);
290+
#endif
265291
}
266292

267293
DeleteCriticalSection(&ds->crit);

‎cheevos/cheevos.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1674,7 +1674,7 @@ static void cheevos_test_cheevo_set(const cheevoset_t *set)
16741674
shotname[sizeof(shotname) - 1] = '\0';
16751675

16761676
if (take_screenshot(shotname, true,
1677-
video_driver_cached_frame_has_valid_framebuffer()))
1677+
video_driver_cached_frame_has_valid_framebuffer(), false, true))
16781678
CHEEVOS_LOG("[CHEEVOS]: got a screenshot for cheevo %u\n", cheevo->id);
16791679
else
16801680
CHEEVOS_LOG("[CHEEVOS]: failed to get screenshot for cheevo %u\n", cheevo->id);
@@ -2080,7 +2080,7 @@ void cheevos_populate_menu(void *data)
20802080
cheevo_t *cheevo = cheevos_locals.core.cheevos;
20812081
end = cheevo + cheevos_locals.core.count;
20822082

2083-
if(settings->bools.cheevos_enable && settings->bools.cheevos_hardcore_mode_enable
2083+
if(settings->bools.cheevos_enable && settings->bools.cheevos_hardcore_mode_enable
20842084
&& cheevos_loaded)
20852085
{
20862086
if (!cheevos_hardcore_paused)

0 commit comments

Comments
 (0)