RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-22 02:32:36 +01:00
Code Issues Releases Wiki Activity

Update libusb to v1.0.26

Browse Source
This commit is contained in:
RipleyTom 2022-04-28 19:18:12 +02:00 committed by Megamouse
parent 7a434d19a6
commit 8316469cfc
6 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty/libusb/CMakeLists.txt vendored
View File

@ -13,7 +13,7 @@ option(WITHOUT_PTHREADS "force pthreads to not be used. if on, then they are us
set(LIBUSB_MAJOR 1) set(LIBUSB_MAJOR 1)
set(LIBUSB_MINOR 0) set(LIBUSB_MINOR 0)
set(LIBUSB_MICRO 23) set(LIBUSB_MICRO 26)
macro(append_compiler_flags) macro(append_compiler_flags)
foreach(FLAG IN ITEMS ${ARGN}) foreach(FLAG IN ITEMS ${ARGN})

2
3rdparty/libusb/config.h.cmake vendored
View File

@ -1,6 +1,8 @@
#ifndef LIBUSB_CONFIG_H #ifndef LIBUSB_CONFIG_H
#define LIBUSB_CONFIG_H #define LIBUSB_CONFIG_H
#define PRINTF_FORMAT(a, b) __attribute__ ((__format__ (__printf__, a, b)))
#define DEFAULT_VISIBILITY @DEFAULT_VISIBILITY@ #define DEFAULT_VISIBILITY @DEFAULT_VISIBILITY@
#cmakedefine ENABLE_DEBUG_LOGGING #cmakedefine ENABLE_DEBUG_LOGGING

2
3rdparty/libusb/libusb vendored

@ -1 +1 @@
Subproject commit c33990a300674e24f47ff0f172f7efb10b63b88a Subproject commit 4239bc3a50014b8e6a5a2a59df1fff3b7469543b

1
3rdparty/libusb/os.cmake vendored
View File

@ -49,6 +49,7 @@ elseif (APPLE)
find_package(IOKit REQUIRED) find_package(IOKit REQUIRED)
list(APPEND LIBUSB_LIBRARIES ${IOKit_LIBRARIES}) list(APPEND LIBUSB_LIBRARIES ${IOKit_LIBRARIES})
list(APPEND LIBUSB_LIBRARIES "-framework Security")
# Currently only objc_registerThreadWithCollector requires linking against it # Currently only objc_registerThreadWithCollector requires linking against it
# which is only for MAC_OS_X_VERSION_MIN_REQUIRED >= 1060 # which is only for MAC_OS_X_VERSION_MIN_REQUIRED >= 1060

2
rpcs3/Emu/RSX/Common/surface_store.h
View File

@ -1108,7 +1108,7 @@ namespace rsx
return result; return result;
} }
void check_for_duplicates(std::vector<surface_overlap_info>& sections, const rsx::address_range& range) void check_for_duplicates(std::vector<surface_overlap_info>& sections)
{ {
utils::address_range test_range; utils::address_range test_range;
for (const auto& section : sections) for (const auto& section : sections)

2
rpcs3/Emu/RSX/Common/texture_cache.h
View File

@ -1976,7 +1976,7 @@ namespace rsx
{ {
rsx_log.warning("[Performance warning] Texture gather routine encountered too many objects! Operation=%d, Mipmaps=%d, Depth=%d, Sections=%zu, Ratio=%llu%", rsx_log.warning("[Performance warning] Texture gather routine encountered too many objects! Operation=%d, Mipmaps=%d, Depth=%d, Sections=%zu, Ratio=%llu%",
static_cast<int>(result.external_subresource_desc.op), attr.mipmaps, attr.depth, overlapping_fbos.size(), coverage_ratio); static_cast<int>(result.external_subresource_desc.op), attr.mipmaps, attr.depth, overlapping_fbos.size(), coverage_ratio);
m_rtts.check_for_duplicates(overlapping_fbos, memory_range); m_rtts.check_for_duplicates(overlapping_fbos);
} }
} }