From 860b76452f1d63e1be7b40f93ecaf79561d79099 Mon Sep 17 00:00:00 2001 From: kd-11 Date: Mon, 29 May 2017 19:24:09 +0300 Subject: [PATCH] vulkan bringup on linux cleanup: drop unused stuff --- CMakeLists.txt | 1 - rpcs3/CMakeLists.txt | 42 +- rpcs3/Emu/RSX/GL/GLGSRender.cpp | 3 +- rpcs3/Emu/RSX/RSXThread.cpp | 142 +-- rpcs3/Emu/RSX/RSXThread.h | 64 -- rpcs3/Emu/RSX/VK/VKGSRender.cpp | 52 +- rpcs3/Emu/RSX/VK/VKGSRender.h | 7 +- rpcs3/Emu/RSX/VK/VKHelpers.h | 35 +- rpcs3/Emu/RSX/VK/VKTextureCache.h | 2 +- rpcs3/Emu/RSX/VK/VKVertexBuffers.cpp | 2 +- rpcs3/Emu/RSX/rsx_cache.cpp | 139 --- rpcs3/Emu/RSX/rsx_cache.h | 63 -- rpcs3/Emu/System.cpp | 2 - rpcs3/Emu/System.h | 2 - rpcs3/Gui/SettingsDialog.cpp | 7 - rpcs3/cmake_modules/FindwxWidgets.cmake | 1088 ----------------------- rpcs3/rpcs3_app.cpp | 6 +- rpcs3/rpcs3_automoc.cpp | 29 + rpcs3/rpcs3qt/emu_settings.cpp | 64 ++ rpcs3/rpcs3qt/emu_settings.h | 67 +- rsx_program_decompiler | 1 - 21 files changed, 205 insertions(+), 1613 deletions(-) delete mode 100644 rpcs3/Emu/RSX/rsx_cache.cpp delete mode 100644 rpcs3/cmake_modules/FindwxWidgets.cmake create mode 100644 rpcs3/rpcs3_automoc.cpp delete mode 160000 rsx_program_decompiler diff --git a/CMakeLists.txt b/CMakeLists.txt index 6ab36da2fb..17fe139fea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,7 +46,6 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${PROJECT_BINARY_DIR}/bin") set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${PROJECT_BINARY_DIR}/bin") add_subdirectory( Vulkan ) add_subdirectory( rpcs3 ) -add_subdirectory( rsx_program_decompiler ) include_directories(3rdparty/hidapi/hidapi) if(APPLE) diff --git a/rpcs3/CMakeLists.txt b/rpcs3/CMakeLists.txt index 964dc1d8c2..db59f125ac 100644 --- a/rpcs3/CMakeLists.txt +++ b/rpcs3/CMakeLists.txt @@ -155,16 +155,13 @@ ${LLVM_INCLUDE_DIRS} "${RPCS3_SRC_DIR}/../Utilities/yaml-cpp/include" "${RPCS3_SRC_DIR}/../asmjit/src/asmjit" "${RPCS3_SRC_DIR}/../3rdparty/GSL/include" -"${RPCS3_SRC_DIR}/../rsx_program_decompiler/rsx_decompiler" -"${RPCS3_SRC_DIR}/../rsx_program_decompiler/shader_code" "${RPCS3_SRC_DIR}/../Vulkan/Vulkan-LoaderAndValidationLayers/include" "${RPCS3_SRC_DIR}/../Vulkan/glslang/glslang/Public" +"${RPCS3_SRC_DIR}/../Vulkan/glslang/" "${RPCS3_SRC_DIR}/../3rdparty/hidapi/hidapi" # Includes 3rdparty stuff that isn't included yet "${RPCS3_SRC_DIR}/../3rdparty/GL" "${RPCS3_SRC_DIR}/../3rdparty/stblib" -"${RPCS3_SRC_DIR}/../rsx_program_decompiler/rsx_decompiler" -"${RPCS3_SRC_DIR}/../rsx_program_decompiler/shader_code" "${RPCS3_SRC_DIR}/../3rdparty/cereal/include" ) if(WIN32) @@ -217,20 +214,33 @@ GLOB_RECURSE RPCS3_SRC "${RPCS3_SRC_DIR}/*.cpp" "${RPCS3_SRC_DIR}/../Utilities/*.cpp" -"${RPCS3_SRC_DIR}/../rsx_program_decompiler/rsx_decompiler/*.cpp" -"${RPCS3_SRC_DIR}/../rsx_program_decompiler/shader_code/*.cpp" "${RPCS3_SRC_DIR}/../asmjit/src/asmjit/*.cpp" +"${RPCS3_SRC_DIR}/../Vulkan/glslang/glslang/GenericCodeGen/*.cpp" +"${RPCS3_SRC_DIR}/../Vulkan/glslang/glslang/MachineIndependent/*.cpp" +"${RPCS3_SRC_DIR}/../Vulkan/glslang/glslang/OSDependent/Unix/*.cpp" +"${RPCS3_SRC_DIR}/../Vulkan/glslang/OGLCompilersDLL/*.cpp" +"${RPCS3_SRC_DIR}/../Vulkan/glslang/hlsl/*.cpp" +"${RPCS3_SRC_DIR}/../Vulkan/glslang/SPIRV/*.cpp" ) -if(NOT WIN32) - set (EXCLUDE_DIR "/RSX/VK/") - foreach (TMP_PATH ${RPCS3_SRC}) - string (FIND ${TMP_PATH} ${EXCLUDE_DIR} EXCLUDE_DIR_FOUND) - if (NOT ${EXCLUDE_DIR_FOUND} EQUAL -1) +#File exclusion section + +#Ignore vulkan if not on windows or linux +if(NOT WIN32 AND NOT "${CMAKE_SYSTEM}" MATCHES "Linux") + set (EXCLUDE_FILES "/RSX/VK/") +endif() + +#Do not compile the Qt moc files, they are compiled when generating automoc +set (EXCLUDE_FILES ${EXLUDE_FILES} "moc_") + +foreach (TMP_PATH ${RPCS3_SRC}) + foreach (EXCLUDE_PATH ${EXCLUDE_FILES}) + string (FIND ${TMP_PATH} ${EXCLUDE_PATH} EXCLUDE_FILE_FOUND) + if (NOT ${EXCLUDE_FILE_FOUND} EQUAL -1) list (REMOVE_ITEM RPCS3_SRC ${TMP_PATH}) endif () - endforeach(TMP_PATH) -endif() + endforeach(EXCLUDE_PATH) +endforeach(TMP_PATH) # The Gui folder contains wxWidgets stuff, which we no longer want. foreach (TMP_PATH ${RPCS3_SRC}) @@ -261,10 +271,8 @@ if(WIN32) endif() target_link_libraries(rpcs3 avformat.lib avcodec.lib avutil.lib swresample.lib swscale.lib png16_static ${OPENAL_LIBRARY} ${ADDITIONAL_LIBS}) else() - target_link_libraries(rpcs3 ${OPENAL_LIBRARY} ${GLEW_LIBRARY} ${OPENGL_LIBRARIES} hidapi-hidraw udev) - target_link_libraries(rpcs3 -ldl -latomic -lpthread ${ZLIB_LIBRARIES} ${ADDITIONAL_LIBS}) - + target_link_libraries(rpcs3 -ldl -latomic -lpthread -lvulkan ${ZLIB_LIBRARIES} ${ADDITIONAL_LIBS}) if (USE_SYSTEM_FFMPEG) link_libraries(${FFMPEG_LIBRARY_DIR}) target_link_libraries(rpcs3 libavformat.so libavcodec.so libavutil.so libswresample.so libswscale.so) @@ -281,8 +289,6 @@ if(LLVM_FOUND) target_link_libraries(rpcs3 ${LLVM_LIBS}) endif() -target_link_libraries(rpcs3 rsx_decompiler shader_code) - set_target_properties(rpcs3 PROPERTIES COTIRE_CXX_PREFIX_HEADER_INIT "${RPCS3_SRC_DIR}/stdafx.h") cotire(rpcs3) diff --git a/rpcs3/Emu/RSX/GL/GLGSRender.cpp b/rpcs3/Emu/RSX/GL/GLGSRender.cpp index 025b89c699..16b4f0f202 100644 --- a/rpcs3/Emu/RSX/GL/GLGSRender.cpp +++ b/rpcs3/Emu/RSX/GL/GLGSRender.cpp @@ -24,7 +24,8 @@ namespace GLGSRender::GLGSRender() : GSRender() { - shaders_cache.load(rsx::old_shaders_cache::shader_language::glsl); + //TODO + //shaders_cache.load(rsx::old_shaders_cache::shader_language::glsl); } u32 GLGSRender::enable(u32 condition, u32 cap) diff --git a/rpcs3/Emu/RSX/RSXThread.cpp b/rpcs3/Emu/RSX/RSXThread.cpp index 9bce928e66..ab07d57760 100644 --- a/rpcs3/Emu/RSX/RSXThread.cpp +++ b/rpcs3/Emu/RSX/RSXThread.cpp @@ -27,51 +27,7 @@ namespace rsx { std::function g_access_violation_handler; - void old_shaders_cache::shaders_cache::load(const std::string &path, shader_language lang) - { - const std::string lang_name(lang == shader_language::glsl ? "glsl" : "hlsl"); - - auto extract_hash = [](const std::string &string) - { - return std::stoull(string.substr(0, string.find('.')).c_str(), 0, 16); - }; - - for (const auto& entry : fs::dir(path)) - { - if (entry.name == "." || entry.name == "..") - continue; - - u64 hash; - - try - { - hash = extract_hash(entry.name); - } - catch (...) - { - continue; - } - - if (fmt::match(entry.name, "*.fs." + lang_name)) - { - fs::file file{ path + entry.name }; - decompiled_fragment_shaders.insert(hash, { file.to_string() }); - continue; - } - - if (fmt::match(entry.name, "*.vs." + lang_name)) - { - fs::file file{ path + entry.name }; - decompiled_vertex_shaders.insert(hash, { file.to_string() }); - continue; - } - } - } - - void old_shaders_cache::shaders_cache::load(shader_language lang) - { - load(Emu.GetCachePath(), lang); - } + //TODO: Restore a working shaders cache u32 get_address(u32 offset, u32 location) { @@ -1046,102 +1002,6 @@ namespace rsx return result; } - raw_program thread::get_raw_program() const - { - raw_program result{}; - - u32 fp_info = rsx::method_registers.shader_program_address(); - - result.state.input_attributes = rsx::method_registers.vertex_attrib_input_mask(); - result.state.output_attributes = rsx::method_registers.vertex_attrib_output_mask(); - result.state.ctrl = rsx::method_registers.shader_control(); - result.state.divider_op = rsx::method_registers.frequency_divider_operation_mask(); - result.state.alpha_func = (u32)rsx::method_registers.alpha_func(); - result.state.fog_mode = (u32)rsx::method_registers.fog_equation(); - result.state.is_int = 0; - - for (u8 index = 0; index < rsx::limits::vertex_count; ++index) - { - bool is_int = false; - - if (rsx::method_registers.vertex_arrays_info[index].size() > 0) - { - is_int = is_int_type(rsx::method_registers.vertex_arrays_info[index].type()); - result.state.frequency[index] = rsx::method_registers.vertex_arrays_info[index].frequency(); - } - else if (rsx::method_registers.register_vertex_info[index].size > 0) - { - is_int = is_int_type(rsx::method_registers.register_vertex_info[index].type); - result.state.frequency[index] = rsx::method_registers.register_vertex_info[index].frequency; - result.state.divider_op |= (1 << index); - } - else - { - result.state.frequency[index] = 0; - } - - if (is_int) - { - result.state.is_int |= 1 << index; - } - } - - for (u8 index = 0; index < rsx::limits::fragment_textures_count; ++index) - { - if (!rsx::method_registers.fragment_textures[index].enabled()) - { - result.state.textures_alpha_kill[index] = 0; - result.state.textures_zfunc[index] = 0; - result.state.textures[index] = rsx::texture_target::none; - continue; - } - - result.state.textures_alpha_kill[index] = rsx::method_registers.fragment_textures[index].alpha_kill_enabled() ? 1 : 0; - result.state.textures_zfunc[index] = rsx::method_registers.fragment_textures[index].zfunc(); - - switch (rsx::method_registers.fragment_textures[index].get_extended_texture_dimension()) - { - case rsx::texture_dimension_extended::texture_dimension_1d: result.state.textures[index] = rsx::texture_target::_1; break; - case rsx::texture_dimension_extended::texture_dimension_2d: result.state.textures[index] = rsx::texture_target::_2; break; - case rsx::texture_dimension_extended::texture_dimension_3d: result.state.textures[index] = rsx::texture_target::_3; break; - case rsx::texture_dimension_extended::texture_dimension_cubemap: result.state.textures[index] = rsx::texture_target::cube; break; - - default: - result.state.textures[index] = rsx::texture_target::none; - break; - } - } - - for (u8 index = 0; index < rsx::limits::vertex_textures_count; ++index) - { - if (!rsx::method_registers.fragment_textures[index].enabled()) - { - result.state.vertex_textures[index] = rsx::texture_target::none; - continue; - } - - switch (rsx::method_registers.fragment_textures[index].get_extended_texture_dimension()) - { - case rsx::texture_dimension_extended::texture_dimension_1d: result.state.vertex_textures[index] = rsx::texture_target::_1; break; - case rsx::texture_dimension_extended::texture_dimension_2d: result.state.vertex_textures[index] = rsx::texture_target::_2; break; - case rsx::texture_dimension_extended::texture_dimension_3d: result.state.vertex_textures[index] = rsx::texture_target::_3; break; - case rsx::texture_dimension_extended::texture_dimension_cubemap: result.state.vertex_textures[index] = rsx::texture_target::cube; break; - - default: - result.state.vertex_textures[index] = rsx::texture_target::none; - break; - } - } - - result.vertex_shader.ucode_ptr = rsx::method_registers.transform_program.data(); - result.vertex_shader.offset = rsx::method_registers.transform_program_start(); - - result.fragment_shader.ucode_ptr = vm::base(rsx::get_address(fp_info & ~0x3, (fp_info & 0x3) - 1)); - result.fragment_shader.offset = 0; - - return result; - } - void thread::reset() { rsx::method_registers.reset(); diff --git a/rpcs3/Emu/RSX/RSXThread.h b/rpcs3/Emu/RSX/RSXThread.h index 9956524504..b91489ff7a 100644 --- a/rpcs3/Emu/RSX/RSXThread.h +++ b/rpcs3/Emu/RSX/RSXThread.h @@ -26,18 +26,6 @@ extern u64 get_system_time(); extern bool user_asked_for_frame_capture; extern rsx::frame_capture_data frame_debug; -namespace rsx -{ - namespace old_shaders_cache - { - enum class shader_language - { - glsl, - hlsl, - }; - } -} - namespace rsx { namespace limits @@ -54,54 +42,6 @@ namespace rsx }; } - namespace old_shaders_cache - { - struct decompiled_shader - { - std::string code; - }; - - struct finalized_shader - { - u64 ucode_hash; - std::string code; - }; - - template> - struct cache - { - private: - std::unordered_map m_entries; - - public: - const Type* find(u64 key) const - { - auto found = m_entries.find(key); - - if (found == m_entries.end()) - return nullptr; - - return &found->second; - } - - void insert(KeyType key, const Type &shader) - { - m_entries.insert({ key, shader }); - } - }; - - struct shaders_cache - { - cache decompiled_fragment_shaders; - cache decompiled_vertex_shaders; - cache finailized_fragment_shaders; - cache finailized_vertex_shaders; - - void load(const std::string &path, shader_language lang); - void load(shader_language lang); - }; - } - u32 get_vertex_type_size_on_host(vertex_base_type type, u32 size); u32 get_address(u32 offset, u32 location); @@ -172,9 +112,6 @@ namespace rsx std::vector element_push_buffer; public: - old_shaders_cache::shaders_cache shaders_cache; - rsx::programs_cache programs_cache; - CellGcmControl* ctrl = nullptr; Timer timer_sync; @@ -356,7 +293,6 @@ namespace rsx virtual bool scaled_image_from_memory(blit_src_info& src_info, blit_dst_info& dst_info, bool interpolate){ return false; } - struct raw_program get_raw_program() const; public: void reset(); void init(const u32 ioAddress, const u32 ioSize, const u32 ctrlAddress, const u32 localAddress); diff --git a/rpcs3/Emu/RSX/VK/VKGSRender.cpp b/rpcs3/Emu/RSX/VK/VKGSRender.cpp index 9f943c8be6..97d485eddf 100644 --- a/rpcs3/Emu/RSX/VK/VKGSRender.cpp +++ b/rpcs3/Emu/RSX/VK/VKGSRender.cpp @@ -449,10 +449,11 @@ namespace VKGSRender::VKGSRender() : GSRender() { - shaders_cache.load(rsx::old_shaders_cache::shader_language::glsl); + //shaders_cache.load(rsx::old_shaders_cache::shader_language::glsl); + printf("Starting vulkan renderer\n"); u32 instance_handle = m_thread_context.createInstance("RPCS3"); - + printf("Instance created, handle=%u\n", instance_handle); if (instance_handle > 0) { m_thread_context.makeCurrentInstance(instance_handle); @@ -497,6 +498,48 @@ VKGSRender::VKGSRender() : GSRender() { m_swap_chain = m_thread_context.createSwapChain(hInstance, hWnd, gpus[0]); } + +#elif __linux__ + + Window window = (Window)m_frame->handle(); + Display *display = XOpenDisplay(0); + + printf("Entering enumeration logic...\n"); + + std::vector& gpus = m_thread_context.enumerateDevices(); + + //Actually confirm that the loader found at least one compatible device + //This should not happen unless something is wrong with the driver setup on the target system + if (gpus.size() == 0) + { + //We can't throw in Emulator::Load, so we show error and return + LOG_FATAL(RSX, "No compatible GPU devices found"); + m_device = VK_NULL_HANDLE; + return; + } + + printf("Post-enumerate devices, window=%llx, display=0x%p\n", window, display); + XFlush(display); + + bool gpu_found = false; + std::string adapter_name = g_cfg.video.vk.adapter; + for (auto &gpu : gpus) + { + if (gpu.name() == adapter_name) + { + m_swap_chain = m_thread_context.createSwapChain(display, window, gpu); + gpu_found = true; + break; + } + } + + if (!gpu_found || adapter_name.empty()) + { + m_swap_chain = m_thread_context.createSwapChain(display, window, gpus[0]); + } + + printf("Swapchain creation completed\n"); + m_display_handle = display; #endif @@ -659,6 +702,11 @@ VKGSRender::~VKGSRender() m_thread_context.close(); delete m_swap_chain; + +#ifdef __linux__ + if (m_display_handle) + XCloseDisplay(m_display_handle); +#endif } bool VKGSRender::on_access_violation(u32 address, bool is_writing) diff --git a/rpcs3/Emu/RSX/VK/VKGSRender.h b/rpcs3/Emu/RSX/VK/VKGSRender.h index 1cff1b2f5b..ad52a2bffe 100644 --- a/rpcs3/Emu/RSX/VK/VKGSRender.h +++ b/rpcs3/Emu/RSX/VK/VKGSRender.h @@ -11,6 +11,7 @@ #include "VKProgramBuffer.h" #include "../GCM.h" #include "../rsx_utils.h" +#include #include #pragma comment(lib, "VKstatic.1.lib") @@ -165,10 +166,14 @@ private: s32 m_last_flushable_cb = -1; std::mutex m_flush_queue_mutex; - std::atomic m_flush_commands = false; + std::atomic m_flush_commands = { false }; std::atomic m_queued_threads = { 0 }; std::thread::id rsx_thread; + +#ifdef __linux__ + Display *m_display_handle = nullptr; +#endif public: VKGSRender(); diff --git a/rpcs3/Emu/RSX/VK/VKHelpers.h b/rpcs3/Emu/RSX/VK/VKHelpers.h index 122ed65b36..c620a8d034 100644 --- a/rpcs3/Emu/RSX/VK/VKHelpers.h +++ b/rpcs3/Emu/RSX/VK/VKHelpers.h @@ -8,6 +8,10 @@ #include #include +#ifdef __linux__ +#include +#endif + #include "Emu/System.h" #include "VulkanAPI.h" #include "../GCM.h" @@ -799,15 +803,9 @@ namespace vk void init_swapchain(u32 width, u32 height) { VkSwapchainKHR old_swapchain = m_vk_swapchain; - - uint32_t num_modes; vk::physical_device& gpu = const_cast(dev.gpu()); - CHECK_RESULT(vkGetPhysicalDeviceSurfacePresentModesKHR(gpu, m_surface, &num_modes, NULL)); - - std::vector present_mode_descriptors(num_modes); - CHECK_RESULT(vkGetPhysicalDeviceSurfacePresentModesKHR(gpu, m_surface, &num_modes, present_mode_descriptors.data())); - - VkSurfaceCapabilitiesKHR surface_descriptors; + + VkSurfaceCapabilitiesKHR surface_descriptors = {}; CHECK_RESULT(vkGetPhysicalDeviceSurfaceCapabilitiesKHR(gpu, m_surface, &surface_descriptors)); VkExtent2D swapchainExtent; @@ -1058,6 +1056,8 @@ namespace vk void enable_debugging() { + if (!g_cfg.video.debug_output) return; + PFN_vkDebugReportCallbackEXT callback = vk::dbgFunc; createDebugReportCallback = (PFN_vkCreateDebugReportCallbackEXT)vkGetInstanceProcAddr(m_instance, "vkCreateDebugReportCallbackEXT"); @@ -1089,7 +1089,11 @@ namespace vk const char *requested_extensions[] = { "VK_KHR_surface", +#ifdef _WIN32 "VK_KHR_win32_surface", +#else + "VK_KHR_xlib_surface", +#endif "VK_EXT_debug_report", }; @@ -1166,6 +1170,7 @@ namespace vk } #ifdef _WIN32 + vk::swap_chain* createSwapChain(HINSTANCE hInstance, HWND hWnd, vk::physical_device &dev) { VkWin32SurfaceCreateInfoKHR createInfo = {}; @@ -1175,6 +1180,18 @@ namespace vk VkSurfaceKHR surface; CHECK_RESULT(vkCreateWin32SurfaceKHR(m_instance, &createInfo, NULL, &surface)); +#elif __linux__ + + vk::swap_chain* createSwapChain(Display *display, Window window, vk::physical_device &dev) + { + VkXlibSurfaceCreateInfoKHR createInfo = {}; + createInfo.sType = VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR; + createInfo.dpy = display; + createInfo.window = window; + + VkSurfaceKHR surface; + CHECK_RESULT(vkCreateXlibSurfaceKHR(m_instance, &createInfo, nullptr, &surface)); +#endif uint32_t device_queues = dev.get_queue_count(); std::vector supportsPresent(device_queues); @@ -1251,8 +1268,6 @@ namespace vk return new swap_chain(dev, presentQueueNodeIndex, graphicsQueueNodeIndex, format, surface, color_space); } -#endif //if _WIN32 - }; class descriptor_pool diff --git a/rpcs3/Emu/RSX/VK/VKTextureCache.h b/rpcs3/Emu/RSX/VK/VKTextureCache.h index f1d494e92b..6fa5ba4242 100644 --- a/rpcs3/Emu/RSX/VK/VKTextureCache.h +++ b/rpcs3/Emu/RSX/VK/VKTextureCache.h @@ -205,7 +205,7 @@ namespace vk template void do_memory_transfer(void *pixels_dst, const void *pixels_src) { - if (sizeof T == 1) + if (sizeof(T) == 1) memcpy(pixels_dst, pixels_src, cpu_address_range); else { diff --git a/rpcs3/Emu/RSX/VK/VKVertexBuffers.cpp b/rpcs3/Emu/RSX/VK/VKVertexBuffers.cpp index fdda3cedfa..5feebfb09b 100644 --- a/rpcs3/Emu/RSX/VK/VKVertexBuffers.cpp +++ b/rpcs3/Emu/RSX/VK/VKVertexBuffers.cpp @@ -551,6 +551,6 @@ VKGSRender::upload_vertex_data() { draw_command_visitor visitor(*m_device, m_index_buffer_ring_info, m_attrib_ring_info, m_program, descriptor_sets, m_buffer_view_to_clean, - [this](const auto& state, const auto& range) { return get_vertex_buffers(state, range); }); + [this](const auto& state, const auto& range) { return this->get_vertex_buffers(state, range); }); return std::apply_visitor(visitor, get_draw_command(rsx::method_registers)); } diff --git a/rpcs3/Emu/RSX/rsx_cache.cpp b/rpcs3/Emu/RSX/rsx_cache.cpp deleted file mode 100644 index a7574da82e..0000000000 --- a/rpcs3/Emu/RSX/rsx_cache.cpp +++ /dev/null @@ -1,139 +0,0 @@ -#include "stdafx.h" -#include "rsx_cache.h" -#include "Emu/System.h" - -namespace rsx -{ - void shaders_cache::path(const std::string &path_) - { - m_path = path_; - } - - shader_info shaders_cache::get(const program_cache_context &ctxt, raw_shader &raw_shader, const program_state& state) - { - auto found_entry = m_entries.find(raw_shader); - - shader_info info; - entry_t *entry; - - if (found_entry != m_entries.end()) - { - entry = &found_entry->second; - } - else - { - //analyze_raw_shader(raw_shader); - - std::string shader_name_base = - fmt::format("%lld.%016llx", ++m_index, raw_shader.hash()) + - (raw_shader.type == rsx::program_type::fragment ? ".fp" : ".vp"); - - fs::file{ m_path + shader_name_base + ".ucode", fs::rewrite } - .write(raw_shader.ucode.data(), raw_shader.ucode.size()); - - rsx::decompiled_shader decompiled_shader = decompile(raw_shader, ctxt.lang); - - fs::file{ m_path + shader_name_base + (ctxt.lang == rsx::decompile_language::glsl ? ".glsl" : ".hlsl"), fs::rewrite } - .write(decompiled_shader.code); - - auto inserted = m_entries.insert({ raw_shader, entry_t{ m_index, decompiled_shader } }).first; - inserted->second.decompiled.raw = &inserted->first; - entry = &inserted->second; - } - - info.decompiled = &entry->decompiled; - - auto found_complete = entry->complete.find(state); - - if (found_complete != entry->complete.end()) - { - info.complete = &found_complete->second; - } - else - { - rsx::complete_shader complete_shader = ctxt.complete_shader(entry->decompiled, state); - complete_shader.decompiled = info.decompiled; - info.complete = &entry->complete.insert({ state, complete_shader }).first->second; - info.complete->user_data = nullptr; - - const std::string hash_combination = fmt::format("%lld.%016llx.%016llx", entry->index, raw_shader.hash(), state.hash()); - - std::string shader_name = - hash_combination + - (raw_shader.type == rsx::program_type::fragment ? ".fp" : ".vp") + - (ctxt.lang == rsx::decompile_language::glsl ? ".glsl" : ".hlsl"); - - fs::file{ m_path + shader_name, fs::rewrite }.write(info.complete->code); - fs::file{ m_path + hash_combination + ".state", fs::rewrite }.write(state); - } - - if (info.complete->user_data == nullptr) - { - info.complete->user_data = ctxt.compile_shader(raw_shader.type, info.complete->code); - } - - return info; - } - - void shaders_cache::clear(const program_cache_context& context) - { - for (auto &entry : m_entries) - { - for (auto &shader : entry.second.complete) - { - context.remove_shader(shader.second.user_data); - } - } - - m_entries.clear(); - } - - programs_cache::programs_cache() - { - m_vertex_shaders_cache.path(Emu.GetCachePath()); - m_fragment_shader_cache.path(Emu.GetCachePath()); - } - - programs_cache::~programs_cache() - { - clear(); - } - - program_info programs_cache::get(raw_program raw_program_, decompile_language lang) - { - raw_program_.vertex_shader.type = program_type::vertex; - raw_program_.fragment_shader.type = program_type::fragment; - - analyze_raw_shader(raw_program_.vertex_shader); - analyze_raw_shader(raw_program_.fragment_shader); - - auto found = m_program_cache.find(raw_program_); - - if (found != m_program_cache.end()) - { - return found->second; - } - - program_info result; - - result.vertex_shader = m_vertex_shaders_cache.get(context, raw_program_.vertex_shader, raw_program_.state); - result.fragment_shader = m_fragment_shader_cache.get(context, raw_program_.fragment_shader, raw_program_.state); - result.program = context.make_program(result.vertex_shader.complete->user_data, result.fragment_shader.complete->user_data); - m_program_cache.insert({ raw_program_, result }); - - return result; - } - - void programs_cache::clear() - { - for (auto &entry : m_program_cache) - { - context.remove_program(entry.second.program); - } - - m_program_cache.clear(); - - m_vertex_shaders_cache.clear(context); - m_fragment_shader_cache.clear(context); - } -} diff --git a/rpcs3/Emu/RSX/rsx_cache.h b/rpcs3/Emu/RSX/rsx_cache.h index 0ac24bbe12..592437bc78 100644 --- a/rpcs3/Emu/RSX/rsx_cache.h +++ b/rpcs3/Emu/RSX/rsx_cache.h @@ -1,36 +1,10 @@ #pragma once -#include #include "Utilities/VirtualMemory.h" #include "Emu/Memory/vm.h" #include "gcm_enums.h" namespace rsx { - struct shader_info - { - decompiled_shader *decompiled; - complete_shader *complete; - }; - - struct program_info - { - shader_info vertex_shader; - shader_info fragment_shader; - - void *program; - }; - - struct program_cache_context - { - decompile_language lang; - - void*(*compile_shader)(program_type type, const std::string &code); - rsx::complete_shader(*complete_shader)(const decompiled_shader &shader, program_state state); - void*(*make_program)(const void *vertex_shader, const void *fragment_shader); - void(*remove_program)(void *ptr); - void(*remove_shader)(void *ptr); - }; - struct blit_src_info { blit_engine::transfer_source_format format; @@ -64,43 +38,6 @@ namespace rsx u32 rsx_address; }; - class shaders_cache - { - struct entry_t - { - std::int64_t index; - decompiled_shader decompiled; - std::unordered_map complete; - }; - - std::unordered_map m_entries; - std::string m_path; - std::int64_t m_index = -1; - - public: - void path(const std::string &path_); - - shader_info get(const program_cache_context &ctxt, raw_shader &raw_shader, const program_state& state); - void clear(const program_cache_context& context); - }; - - class programs_cache - { - std::unordered_map m_program_cache; - - shaders_cache m_vertex_shaders_cache; - shaders_cache m_fragment_shader_cache; - - public: - program_cache_context context; - - programs_cache(); - ~programs_cache(); - - program_info get(raw_program raw_program_, decompile_language lang); - void clear(); - }; - class buffered_section { protected: diff --git a/rpcs3/Emu/System.cpp b/rpcs3/Emu/System.cpp index 333cb5739a..7ecbc22a71 100644 --- a/rpcs3/Emu/System.cpp +++ b/rpcs3/Emu/System.cpp @@ -89,9 +89,7 @@ void fmt_class_string::format(std::string& out, u64 arg) { case video_renderer::null: return "Null"; case video_renderer::opengl: return "OpenGL"; -#ifdef _WIN32 case video_renderer::vulkan: return "Vulkan"; -#endif #ifdef _MSC_VER case video_renderer::dx12: return "D3D12"; #endif diff --git a/rpcs3/Emu/System.h b/rpcs3/Emu/System.h index 612443449a..0d53883454 100644 --- a/rpcs3/Emu/System.h +++ b/rpcs3/Emu/System.h @@ -74,9 +74,7 @@ enum class video_renderer { null, opengl, -#ifdef _WIN32 vulkan, -#endif #ifdef _MSC_VER dx12, #endif diff --git a/rpcs3/Gui/SettingsDialog.cpp b/rpcs3/Gui/SettingsDialog.cpp index 9dca644e73..8a3dee4fff 100644 --- a/rpcs3/Gui/SettingsDialog.cpp +++ b/rpcs3/Gui/SettingsDialog.cpp @@ -13,10 +13,7 @@ #include #endif -#ifdef _WIN32 #include "Emu/RSX/VK/VKHelpers.h" -#endif - #include "SettingsDialog.h" #include @@ -480,7 +477,6 @@ SettingsDialog::SettingsDialog(wxWindow* parent, const std::string& path) cbox_gs_d3d_adapter->Enable(false); #endif -#ifdef _WIN32 //TODO: This is very slow. Only init once bool vulkan_supported = false; @@ -514,9 +510,6 @@ SettingsDialog::SettingsDialog(wxWindow* parent, const std::string& path) } device_enum_context.close(); -#else - cbox_gs_vk_adapter->Enable(false); -#endif // Rendering s_round_gs_render->Add(cbox_gs_render, wxSizerFlags().Border(wxALL, 5).Expand()); diff --git a/rpcs3/cmake_modules/FindwxWidgets.cmake b/rpcs3/cmake_modules/FindwxWidgets.cmake deleted file mode 100644 index fbf45b5b51..0000000000 --- a/rpcs3/cmake_modules/FindwxWidgets.cmake +++ /dev/null @@ -1,1088 +0,0 @@ -#.rst: -# FindwxWidgets -# ------------- -# -# Find a wxWidgets (a.k.a., wxWindows) installation. -# -# This module finds if wxWidgets is installed and selects a default -# configuration to use. wxWidgets is a modular library. To specify the -# modules that you will use, you need to name them as components to the -# package: -# -# find_package(wxWidgets COMPONENTS core base ...) -# -# There are two search branches: a windows style and a unix style. For -# windows, the following variables are searched for and set to defaults -# in case of multiple choices. Change them if the defaults are not -# desired (i.e., these are the only variables you should change to -# select a configuration): -# -# :: -# -# wxWidgets_ROOT_DIR - Base wxWidgets directory -# (e.g., C:/wxWidgets-2.6.3). -# wxWidgets_LIB_DIR - Path to wxWidgets libraries -# (e.g., C:/wxWidgets-2.6.3/lib/vc_lib). -# wxWidgets_CONFIGURATION - Configuration to use -# (e.g., msw, mswd, mswu, mswunivud, etc.) -# wxWidgets_EXCLUDE_COMMON_LIBRARIES -# - Set to TRUE to exclude linking of -# commonly required libs (e.g., png tiff -# jpeg zlib regex expat). -# -# -# -# For unix style it uses the wx-config utility. You can select between -# debug/release, unicode/ansi, universal/non-universal, and -# static/shared in the QtDialog or ccmake interfaces by turning ON/OFF -# the following variables: -# -# :: -# -# wxWidgets_USE_DEBUG -# wxWidgets_USE_UNICODE -# wxWidgets_USE_UNIVERSAL -# wxWidgets_USE_STATIC -# -# -# -# There is also a wxWidgets_CONFIG_OPTIONS variable for all other -# options that need to be passed to the wx-config utility. For example, -# to use the base toolkit found in the /usr/local path, set the variable -# (before calling the FIND_PACKAGE command) as such: -# -# :: -# -# set(wxWidgets_CONFIG_OPTIONS --toolkit=base --prefix=/usr) -# -# -# -# The following are set after the configuration is done for both windows -# and unix style: -# -# :: -# -# wxWidgets_FOUND - Set to TRUE if wxWidgets was found. -# wxWidgets_INCLUDE_DIRS - Include directories for WIN32 -# i.e., where to find "wx/wx.h" and -# "wx/setup.h"; possibly empty for unices. -# wxWidgets_LIBRARIES - Path to the wxWidgets libraries. -# wxWidgets_LIBRARY_DIRS - compile time link dirs, useful for -# rpath on UNIX. Typically an empty string -# in WIN32 environment. -# wxWidgets_DEFINITIONS - Contains defines required to compile/link -# against WX, e.g. WXUSINGDLL -# wxWidgets_DEFINITIONS_DEBUG- Contains defines required to compile/link -# against WX debug builds, e.g. __WXDEBUG__ -# wxWidgets_CXX_FLAGS - Include dirs and compiler flags for -# unices, empty on WIN32. Essentially -# "`wx-config --cxxflags`". -# wxWidgets_USE_FILE - Convenience include file. -# -# -# -# Sample usage: -# -# :: -# -# # Note that for MinGW users the order of libs is important! -# find_package(wxWidgets COMPONENTS net gl core base) -# if(wxWidgets_FOUND) -# include(${wxWidgets_USE_FILE}) -# # and for each of your dependent executable/library targets: -# target_link_libraries( ${wxWidgets_LIBRARIES}) -# endif() -# -# -# -# If wxWidgets is required (i.e., not an optional part): -# -# :: -# -# find_package(wxWidgets REQUIRED net gl core base) -# include(${wxWidgets_USE_FILE}) -# # and for each of your dependent executable/library targets: -# target_link_libraries( ${wxWidgets_LIBRARIES}) - -#============================================================================= -# Copyright 2004-2009 Kitware, Inc. -# Copyright 2007-2009 Miguel A. Figueroa-Villanueva -# -# Distributed under the OSI-approved BSD License (the "License"); -# see accompanying file Copyright.txt for details. -# -# This software is distributed WITHOUT ANY WARRANTY; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# See the License for more information. -#============================================================================= -# (To distribute this file outside of CMake, substitute the full -# License text for the above reference.) - -# -# FIXME: check this and provide a correct sample usage... -# Remember to connect back to the upper text. -# Sample usage with monolithic wx build: -# -# find_package(wxWidgets COMPONENTS mono) -# ... - -# NOTES -# -# This module has been tested on the WIN32 platform with wxWidgets -# 2.6.2, 2.6.3, and 2.5.3. However, it has been designed to -# easily extend support to all possible builds, e.g., static/shared, -# debug/release, unicode, universal, multilib/monolithic, etc.. -# -# If you want to use the module and your build type is not supported -# out-of-the-box, please contact me to exchange information on how -# your system is setup and I'll try to add support for it. -# -# AUTHOR -# -# Miguel A. Figueroa-Villanueva (miguelf at ieee dot org). -# Jan Woetzel (jw at mip.informatik.uni-kiel.de). -# -# Based on previous works of: -# Jan Woetzel (FindwxWindows.cmake), -# Jorgen Bodde and Jerry Fath (FindwxWin.cmake). - -# TODO/ideas -# -# (1) Option/Setting to use all available wx libs -# In contrast to expert developer who lists the -# minimal set of required libs in wxWidgets_USE_LIBS -# there is the newbie user: -# - who just wants to link against WX with more 'magic' -# - doesn't know the internal structure of WX or how it was built, -# in particular if it is monolithic or not -# - want to link against all available WX libs -# Basically, the intent here is to mimic what wx-config would do by -# default (i.e., `wx-config --libs`). -# -# Possible solution: -# Add a reserved keyword "std" that initializes to what wx-config -# would default to. If the user has not set the wxWidgets_USE_LIBS, -# default to "std" instead of "base core" as it is now. To implement -# "std" will basically boil down to a FOR_EACH lib-FOUND, but maybe -# checking whether a minimal set was found. - - -# FIXME: This and all the DBG_MSG calls should be removed after the -# module stabilizes. -# -# Helper macro to control the debugging output globally. There are -# two versions for controlling how verbose your output should be. -macro(DBG_MSG _MSG) -# message(STATUS -# "${CMAKE_CURRENT_LIST_FILE}(${CMAKE_CURRENT_LIST_LINE}): ${_MSG}") -endmacro() -macro(DBG_MSG_V _MSG) -# message(STATUS -# "${CMAKE_CURRENT_LIST_FILE}(${CMAKE_CURRENT_LIST_LINE}): ${_MSG}") -endmacro() - -# Clear return values in case the module is loaded more than once. -set(wxWidgets_FOUND FALSE) -set(wxWidgets_INCLUDE_DIRS "") -set(wxWidgets_LIBRARIES "") -set(wxWidgets_LIBRARY_DIRS "") -set(wxWidgets_CXX_FLAGS "") - -# Using SYSTEM with INCLUDE_DIRECTORIES in conjunction with wxWidgets on -# the Mac produces compiler errors. Set wxWidgets_INCLUDE_DIRS_NO_SYSTEM -# to prevent UsewxWidgets.cmake from using SYSTEM. -# -# See cmake mailing list discussions for more info: -# http://www.cmake.org/pipermail/cmake/2008-April/021115.html -# http://www.cmake.org/pipermail/cmake/2008-April/021146.html -# -if(APPLE OR CMAKE_CXX_PLATFORM_ID MATCHES "OpenBSD") - set(wxWidgets_INCLUDE_DIRS_NO_SYSTEM 1) -endif() - -# DEPRECATED: This is a patch to support the DEPRECATED use of -# wxWidgets_USE_LIBS. -# -# If wxWidgets_USE_LIBS is set: -# - if using , then override wxWidgets_USE_LIBS -# - else set wxWidgets_FIND_COMPONENTS to wxWidgets_USE_LIBS -if(wxWidgets_USE_LIBS AND NOT wxWidgets_FIND_COMPONENTS) - set(wxWidgets_FIND_COMPONENTS ${wxWidgets_USE_LIBS}) -endif() -DBG_MSG("wxWidgets_FIND_COMPONENTS : ${wxWidgets_FIND_COMPONENTS}") - -# Add the convenience use file if available. -# -# Get dir of this file which may reside in: -# - CMAKE_MAKE_ROOT/Modules on CMake installation -# - CMAKE_MODULE_PATH if user prefers his own specialized version -set(wxWidgets_USE_FILE "") -get_filename_component( - wxWidgets_CURRENT_LIST_DIR ${CMAKE_CURRENT_LIST_FILE} PATH) -# Prefer an existing customized version, but the user might override -# the FindwxWidgets module and not the UsewxWidgets one. -if(EXISTS "${wxWidgets_CURRENT_LIST_DIR}/UsewxWidgets.cmake") - set(wxWidgets_USE_FILE - "${wxWidgets_CURRENT_LIST_DIR}/UsewxWidgets.cmake") -else() - set(wxWidgets_USE_FILE UsewxWidgets) -endif() - -#===================================================================== -# Determine whether unix or win32 paths should be used -#===================================================================== -if(WIN32 AND NOT CYGWIN AND NOT MSYS AND NOT CMAKE_CROSSCOMPILING) - set(wxWidgets_FIND_STYLE "win32") -else() - set(wxWidgets_FIND_STYLE "unix") -endif() - -#===================================================================== -# WIN32_FIND_STYLE -#===================================================================== -if(wxWidgets_FIND_STYLE STREQUAL "win32") - # Useful common wx libs needed by almost all components. - set(wxWidgets_COMMON_LIBRARIES png tiff jpeg zlib regex expat) - - # DEPRECATED: Use find_package(wxWidgets COMPONENTS mono) instead. - if(NOT wxWidgets_FIND_COMPONENTS) - if(wxWidgets_USE_MONOLITHIC) - set(wxWidgets_FIND_COMPONENTS mono) - else() - set(wxWidgets_FIND_COMPONENTS core base) # this is default - endif() - endif() - - # Add the common (usually required libs) unless - # wxWidgets_EXCLUDE_COMMON_LIBRARIES has been set. - if(NOT wxWidgets_EXCLUDE_COMMON_LIBRARIES) - list(APPEND wxWidgets_FIND_COMPONENTS - ${wxWidgets_COMMON_LIBRARIES}) - endif() - - #------------------------------------------------------------------- - # WIN32: Helper MACROS - #------------------------------------------------------------------- - # - # Get filename components for a configuration. For example, - # if _CONFIGURATION = mswunivud, then _UNV=univ, _UCD=u _DBG=d - # if _CONFIGURATION = mswu, then _UNV="", _UCD=u _DBG="" - # - macro(WX_GET_NAME_COMPONENTS _CONFIGURATION _UNV _UCD _DBG) - string(REGEX MATCH "univ" ${_UNV} "${_CONFIGURATION}") - string(REGEX REPLACE "msw.*(u)[d]*$" "u" ${_UCD} "${_CONFIGURATION}") - if(${_UCD} STREQUAL ${_CONFIGURATION}) - set(${_UCD} "") - endif() - string(REGEX MATCH "d$" ${_DBG} "${_CONFIGURATION}") - endmacro() - - # - # Find libraries associated to a configuration. - # - macro(WX_FIND_LIBS _UNV _UCD _DBG) - DBG_MSG_V("m_unv = ${_UNV}") - DBG_MSG_V("m_ucd = ${_UCD}") - DBG_MSG_V("m_dbg = ${_DBG}") - - # FIXME: What if both regex libs are available. regex should be - # found outside the loop and only wx${LIB}${_UCD}${_DBG}. - # Find wxWidgets common libraries. - foreach(LIB ${wxWidgets_COMMON_LIBRARIES} scintilla) - find_library(WX_${LIB}${_DBG} - NAMES - wx${LIB}${_UCD}${_DBG} # for regex - wx${LIB}${_DBG} - PATHS ${WX_LIB_DIR} - NO_DEFAULT_PATH - ) - mark_as_advanced(WX_${LIB}${_DBG}) - endforeach() - - # Find wxWidgets multilib base libraries. - find_library(WX_base${_DBG} - NAMES - wxbase31${_UCD}${_DBG} - wxbase30${_UCD}${_DBG} - wxbase29${_UCD}${_DBG} - wxbase28${_UCD}${_DBG} - wxbase27${_UCD}${_DBG} - wxbase26${_UCD}${_DBG} - wxbase25${_UCD}${_DBG} - PATHS ${WX_LIB_DIR} - NO_DEFAULT_PATH - ) - mark_as_advanced(WX_base${_DBG}) - foreach(LIB net odbc xml) - find_library(WX_${LIB}${_DBG} - NAMES - wxbase31${_UCD}${_DBG}_${LIB} - wxbase30${_UCD}${_DBG}_${LIB} - wxbase29${_UCD}${_DBG}_${LIB} - wxbase28${_UCD}${_DBG}_${LIB} - wxbase27${_UCD}${_DBG}_${LIB} - wxbase26${_UCD}${_DBG}_${LIB} - wxbase25${_UCD}${_DBG}_${LIB} - PATHS ${WX_LIB_DIR} - NO_DEFAULT_PATH - ) - mark_as_advanced(WX_${LIB}${_DBG}) - endforeach() - - # Find wxWidgets monolithic library. - find_library(WX_mono${_DBG} - NAMES - wxmsw${_UNV}31${_UCD}${_DBG} - wxmsw${_UNV}30${_UCD}${_DBG} - wxmsw${_UNV}29${_UCD}${_DBG} - wxmsw${_UNV}28${_UCD}${_DBG} - wxmsw${_UNV}27${_UCD}${_DBG} - wxmsw${_UNV}26${_UCD}${_DBG} - wxmsw${_UNV}25${_UCD}${_DBG} - PATHS ${WX_LIB_DIR} - NO_DEFAULT_PATH - ) - mark_as_advanced(WX_mono${_DBG}) - - # Find wxWidgets multilib libraries. - foreach(LIB core adv aui html media xrc dbgrid gl qa richtext - stc ribbon propgrid webview) - find_library(WX_${LIB}${_DBG} - NAMES - wxmsw${_UNV}31${_UCD}${_DBG}_${LIB} - wxmsw${_UNV}30${_UCD}${_DBG}_${LIB} - wxmsw${_UNV}29${_UCD}${_DBG}_${LIB} - wxmsw${_UNV}28${_UCD}${_DBG}_${LIB} - wxmsw${_UNV}27${_UCD}${_DBG}_${LIB} - wxmsw${_UNV}26${_UCD}${_DBG}_${LIB} - wxmsw${_UNV}25${_UCD}${_DBG}_${LIB} - PATHS ${WX_LIB_DIR} - NO_DEFAULT_PATH - ) - mark_as_advanced(WX_${LIB}${_DBG}) - endforeach() - endmacro() - - # - # Clear all library paths, so that FIND_LIBRARY refinds them. - # - # Clear a lib, reset its found flag, and mark as advanced. - macro(WX_CLEAR_LIB _LIB) - set(${_LIB} "${_LIB}-NOTFOUND" CACHE FILEPATH "Cleared." FORCE) - set(${_LIB}_FOUND FALSE) - mark_as_advanced(${_LIB}) - endmacro() - # Clear all debug or release library paths (arguments are "d" or ""). - macro(WX_CLEAR_ALL_LIBS _DBG) - # Clear wxWidgets common libraries. - foreach(LIB ${wxWidgets_COMMON_LIBRARIES} scintilla) - WX_CLEAR_LIB(WX_${LIB}${_DBG}) - endforeach() - - # Clear wxWidgets multilib base libraries. - WX_CLEAR_LIB(WX_base${_DBG}) - foreach(LIB net odbc xml) - WX_CLEAR_LIB(WX_${LIB}${_DBG}) - endforeach() - - # Clear wxWidgets monolithic library. - WX_CLEAR_LIB(WX_mono${_DBG}) - - # Clear wxWidgets multilib libraries. - foreach(LIB core adv aui html media xrc dbgrid gl qa richtext - stc ribbon propgrid) - WX_CLEAR_LIB(WX_${LIB}${_DBG}) - endforeach() - endmacro() - # Clear all wxWidgets debug libraries. - macro(WX_CLEAR_ALL_DBG_LIBS) - WX_CLEAR_ALL_LIBS("d") - endmacro() - # Clear all wxWidgets release libraries. - macro(WX_CLEAR_ALL_REL_LIBS) - WX_CLEAR_ALL_LIBS("") - endmacro() - - # - # Set the wxWidgets_LIBRARIES variable. - # Also, Sets output variable wxWidgets_FOUND to FALSE if it fails. - # - macro(WX_SET_LIBRARIES _LIBS _DBG) - DBG_MSG_V("Looking for ${${_LIBS}}") - if(WX_USE_REL_AND_DBG) - foreach(LIB ${${_LIBS}}) - DBG_MSG_V("Searching for ${LIB} and ${LIB}d") - DBG_MSG_V("WX_${LIB} : ${WX_${LIB}}") - DBG_MSG_V("WX_${LIB}d : ${WX_${LIB}d}") - if(WX_${LIB} AND WX_${LIB}d) - DBG_MSG_V("Found ${LIB} and ${LIB}d") - list(APPEND wxWidgets_LIBRARIES - debug ${WX_${LIB}d} optimized ${WX_${LIB}} - ) - else() - DBG_MSG_V("- not found due to missing WX_${LIB}=${WX_${LIB}} or WX_${LIB}d=${WX_${LIB}d}") - set(wxWidgets_FOUND FALSE) - endif() - endforeach() - else() - foreach(LIB ${${_LIBS}}) - DBG_MSG_V("Searching for ${LIB}${_DBG}") - DBG_MSG_V("WX_${LIB}${_DBG} : ${WX_${LIB}${_DBG}}") - if(WX_${LIB}${_DBG}) - DBG_MSG_V("Found ${LIB}${_DBG}") - list(APPEND wxWidgets_LIBRARIES ${WX_${LIB}${_DBG}}) - else() - DBG_MSG_V( - "- not found due to missing WX_${LIB}${_DBG}=${WX_${LIB}${_DBG}}") - set(wxWidgets_FOUND FALSE) - endif() - endforeach() - endif() - - DBG_MSG_V("OpenGL") - list(FIND ${_LIBS} gl WX_USE_GL) - if(NOT WX_USE_GL EQUAL -1) - DBG_MSG_V("- is required.") - list(APPEND wxWidgets_LIBRARIES opengl32 glu32) - endif() - - list(APPEND wxWidgets_LIBRARIES winmm comctl32 rpcrt4 wsock32) - endmacro() - - #------------------------------------------------------------------- - # WIN32: Start actual work. - #------------------------------------------------------------------- - - # Look for an installation tree. - find_path(wxWidgets_ROOT_DIR - NAMES include/wx/wx.h - PATHS - ENV wxWidgets_ROOT_DIR - ENV WXWIN - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\wxWidgets_is1;Inno Setup: App Path]" # WX 2.6.x - C:/ - D:/ - ENV ProgramFiles - PATH_SUFFIXES - wxWidgets-3.0.2 - wxWidgets-3.0.1 - wxWidgets-3.0.0 - wxWidgets-2.9.5 - wxWidgets-2.9.4 - wxWidgets-2.9.3 - wxWidgets-2.9.2 - wxWidgets-2.9.1 - wxWidgets-2.9.0 - wxWidgets-2.8.9 - wxWidgets-2.8.8 - wxWidgets-2.8.7 - wxWidgets-2.8.6 - wxWidgets-2.8.5 - wxWidgets-2.8.4 - wxWidgets-2.8.3 - wxWidgets-2.8.2 - wxWidgets-2.8.1 - wxWidgets-2.8.0 - wxWidgets-2.7.4 - wxWidgets-2.7.3 - wxWidgets-2.7.2 - wxWidgets-2.7.1 - wxWidgets-2.7.0 - wxWidgets-2.7.0-1 - wxWidgets-2.6.4 - wxWidgets-2.6.3 - wxWidgets-2.6.2 - wxWidgets-2.6.1 - wxWidgets-2.5.4 - wxWidgets-2.5.3 - wxWidgets-2.5.2 - wxWidgets-2.5.1 - wxWidgets - DOC "wxWidgets base/installation directory" - ) - - # If wxWidgets_ROOT_DIR changed, clear lib dir. - if(NOT WX_ROOT_DIR STREQUAL wxWidgets_ROOT_DIR) - set(WX_ROOT_DIR ${wxWidgets_ROOT_DIR} - CACHE INTERNAL "wxWidgets_ROOT_DIR") - set(wxWidgets_LIB_DIR "wxWidgets_LIB_DIR-NOTFOUND" - CACHE PATH "Cleared." FORCE) - endif() - - if(WX_ROOT_DIR) - # Select one default tree inside the already determined wx tree. - # Prefer static/shared order usually consistent with build - # settings. - if(MINGW) - set(WX_LIB_DIR_PREFIX gcc) - elseif(CMAKE_CL_64) - set(WX_LIB_DIR_PREFIX vc_x64) - else() - set(WX_LIB_DIR_PREFIX vc) - endif() - if(BUILD_SHARED_LIBS) - find_path(wxWidgets_LIB_DIR - NAMES - msw/wx/setup.h - mswd/wx/setup.h - mswu/wx/setup.h - mswud/wx/setup.h - mswuniv/wx/setup.h - mswunivd/wx/setup.h - mswunivu/wx/setup.h - mswunivud/wx/setup.h - PATHS - ${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_dll # prefer shared - ${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_lib - DOC "Path to wxWidgets libraries" - NO_DEFAULT_PATH - ) - else() - find_path(wxWidgets_LIB_DIR - NAMES - msw/wx/setup.h - mswd/wx/setup.h - mswu/wx/setup.h - mswud/wx/setup.h - mswuniv/wx/setup.h - mswunivd/wx/setup.h - mswunivu/wx/setup.h - mswunivud/wx/setup.h - PATHS - ${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_lib # prefer static - ${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_dll - DOC "Path to wxWidgets libraries" - NO_DEFAULT_PATH - ) - endif() - - # If wxWidgets_LIB_DIR changed, clear all libraries. - if(NOT WX_LIB_DIR STREQUAL wxWidgets_LIB_DIR) - set(WX_LIB_DIR ${wxWidgets_LIB_DIR} CACHE INTERNAL "wxWidgets_LIB_DIR") - WX_CLEAR_ALL_DBG_LIBS() - WX_CLEAR_ALL_REL_LIBS() - endif() - - if(WX_LIB_DIR) - # If building shared libs, define WXUSINGDLL to use dllimport. - if(WX_LIB_DIR MATCHES "[dD][lL][lL]") - set(wxWidgets_DEFINITIONS WXUSINGDLL) - DBG_MSG_V("detected SHARED/DLL tree WX_LIB_DIR=${WX_LIB_DIR}") - endif() - - # Search for available configuration types. - foreach(CFG mswunivud mswunivd mswud mswd mswunivu mswuniv mswu msw) - set(WX_${CFG}_FOUND FALSE) - if(EXISTS ${WX_LIB_DIR}/${CFG}) - list(APPEND WX_CONFIGURATION_LIST ${CFG}) - set(WX_${CFG}_FOUND TRUE) - set(WX_CONFIGURATION ${CFG}) - endif() - endforeach() - DBG_MSG_V("WX_CONFIGURATION_LIST=${WX_CONFIGURATION_LIST}") - - if(WX_CONFIGURATION) - set(wxWidgets_FOUND TRUE) - - # If the selected configuration wasn't found force the default - # one. Otherwise, use it but still force a refresh for - # updating the doc string with the current list of available - # configurations. - if(NOT WX_${wxWidgets_CONFIGURATION}_FOUND) - set(wxWidgets_CONFIGURATION ${WX_CONFIGURATION} CACHE STRING - "Set wxWidgets configuration (${WX_CONFIGURATION_LIST})" FORCE) - else() - set(wxWidgets_CONFIGURATION ${wxWidgets_CONFIGURATION} CACHE STRING - "Set wxWidgets configuration (${WX_CONFIGURATION_LIST})" FORCE) - endif() - - # If release config selected, and both release/debug exist. - if(WX_${wxWidgets_CONFIGURATION}d_FOUND) - option(wxWidgets_USE_REL_AND_DBG - "Use release and debug configurations?" TRUE) - set(WX_USE_REL_AND_DBG ${wxWidgets_USE_REL_AND_DBG}) - else() - # If the option exists (already in cache), force it false. - if(wxWidgets_USE_REL_AND_DBG) - set(wxWidgets_USE_REL_AND_DBG FALSE CACHE BOOL - "No ${wxWidgets_CONFIGURATION}d found." FORCE) - endif() - set(WX_USE_REL_AND_DBG FALSE) - endif() - - # Get configuration parameters from the name. - WX_GET_NAME_COMPONENTS(${wxWidgets_CONFIGURATION} UNV UCD DBG) - - # Set wxWidgets lib setup include directory. - if(EXISTS ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION}/wx/setup.h) - set(wxWidgets_INCLUDE_DIRS - ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION}) - else() - DBG_MSG("wxWidgets_FOUND FALSE because ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION}/wx/setup.h does not exists.") - set(wxWidgets_FOUND FALSE) - endif() - - # Set wxWidgets main include directory. - if(EXISTS ${WX_ROOT_DIR}/include/wx/wx.h) - list(APPEND wxWidgets_INCLUDE_DIRS ${WX_ROOT_DIR}/include) - else() - DBG_MSG("wxWidgets_FOUND FALSE because WX_ROOT_DIR=${WX_ROOT_DIR} has no ${WX_ROOT_DIR}/include/wx/wx.h") - set(wxWidgets_FOUND FALSE) - endif() - - # Find wxWidgets libraries. - WX_FIND_LIBS("${UNV}" "${UCD}" "${DBG}") - if(WX_USE_REL_AND_DBG) - WX_FIND_LIBS("${UNV}" "${UCD}" "d") - endif() - - # Settings for requested libs (i.e., include dir, libraries, etc.). - WX_SET_LIBRARIES(wxWidgets_FIND_COMPONENTS "${DBG}") - - # Add necessary definitions for unicode builds - if("${UCD}" STREQUAL "u") - list(APPEND wxWidgets_DEFINITIONS UNICODE _UNICODE) - endif() - - # Add necessary definitions for debug builds - set(wxWidgets_DEFINITIONS_DEBUG _DEBUG __WXDEBUG__) - - endif() - endif() - endif() - -#===================================================================== -# UNIX_FIND_STYLE -#===================================================================== -else() - if(wxWidgets_FIND_STYLE STREQUAL "unix") - #----------------------------------------------------------------- - # UNIX: Helper MACROS - #----------------------------------------------------------------- - # - # Set the default values based on "wx-config --selected-config". - # - macro(WX_CONFIG_SELECT_GET_DEFAULT) - execute_process( - COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}" - ${wxWidgets_CONFIG_OPTIONS} --selected-config - OUTPUT_VARIABLE _wx_selected_config - RESULT_VARIABLE _wx_result - ERROR_QUIET - ) - if(_wx_result EQUAL 0) - foreach(_opt_name debug static unicode universal) - string(TOUPPER ${_opt_name} _upper_opt_name) - if(_wx_selected_config MATCHES "${_opt_name}") - set(wxWidgets_DEFAULT_${_upper_opt_name} ON) - else() - set(wxWidgets_DEFAULT_${_upper_opt_name} OFF) - endif() - endforeach() - else() - foreach(_upper_opt_name DEBUG STATIC UNICODE UNIVERSAL) - set(wxWidgets_DEFAULT_${_upper_opt_name} OFF) - endforeach() - endif() - endmacro() - - # - # Query a boolean configuration option to determine if the system - # has both builds available. If so, provide the selection option - # to the user. - # - macro(WX_CONFIG_SELECT_QUERY_BOOL _OPT_NAME _OPT_HELP) - execute_process( - COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}" - ${wxWidgets_CONFIG_OPTIONS} --${_OPT_NAME}=yes - RESULT_VARIABLE _wx_result_yes - OUTPUT_QUIET - ERROR_QUIET - ) - execute_process( - COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}" - ${wxWidgets_CONFIG_OPTIONS} --${_OPT_NAME}=no - RESULT_VARIABLE _wx_result_no - OUTPUT_QUIET - ERROR_QUIET - ) - string(TOUPPER ${_OPT_NAME} _UPPER_OPT_NAME) - if(_wx_result_yes EQUAL 0 AND _wx_result_no EQUAL 0) - option(wxWidgets_USE_${_UPPER_OPT_NAME} - ${_OPT_HELP} ${wxWidgets_DEFAULT_${_UPPER_OPT_NAME}}) - else() - # If option exists (already in cache), force to available one. - if(DEFINED wxWidgets_USE_${_UPPER_OPT_NAME}) - if(_wx_result_yes EQUAL 0) - set(wxWidgets_USE_${_UPPER_OPT_NAME} ON CACHE BOOL ${_OPT_HELP} FORCE) - else() - set(wxWidgets_USE_${_UPPER_OPT_NAME} OFF CACHE BOOL ${_OPT_HELP} FORCE) - endif() - endif() - endif() - endmacro() - - # - # Set wxWidgets_SELECT_OPTIONS to wx-config options for selecting - # among multiple builds. - # - macro(WX_CONFIG_SELECT_SET_OPTIONS) - set(wxWidgets_SELECT_OPTIONS ${wxWidgets_CONFIG_OPTIONS}) - foreach(_opt_name debug static unicode universal) - string(TOUPPER ${_opt_name} _upper_opt_name) - if(DEFINED wxWidgets_USE_${_upper_opt_name}) - if(wxWidgets_USE_${_upper_opt_name}) - list(APPEND wxWidgets_SELECT_OPTIONS --${_opt_name}=yes) - else() - list(APPEND wxWidgets_SELECT_OPTIONS --${_opt_name}=no) - endif() - endif() - endforeach() - endmacro() - - #----------------------------------------------------------------- - # UNIX: Start actual work. - #----------------------------------------------------------------- - # Support cross-compiling, only search in the target platform. - find_program(wxWidgets_CONFIG_EXECUTABLE wx-config - DOC "Location of wxWidgets library configuration provider binary (wx-config)." - ONLY_CMAKE_FIND_ROOT_PATH - ) - - if(wxWidgets_CONFIG_EXECUTABLE) - set(wxWidgets_FOUND TRUE) - - # get defaults based on "wx-config --selected-config" - WX_CONFIG_SELECT_GET_DEFAULT() - - # for each option: if both builds are available, provide option - WX_CONFIG_SELECT_QUERY_BOOL(debug "Use debug build?") - WX_CONFIG_SELECT_QUERY_BOOL(unicode "Use unicode build?") - WX_CONFIG_SELECT_QUERY_BOOL(universal "Use universal build?") - WX_CONFIG_SELECT_QUERY_BOOL(static "Link libraries statically?") - - # process selection to set wxWidgets_SELECT_OPTIONS - WX_CONFIG_SELECT_SET_OPTIONS() - DBG_MSG("wxWidgets_SELECT_OPTIONS=${wxWidgets_SELECT_OPTIONS}") - - # run the wx-config program to get cxxflags - execute_process( - COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}" - ${wxWidgets_SELECT_OPTIONS} --cxxflags - OUTPUT_VARIABLE wxWidgets_CXX_FLAGS - RESULT_VARIABLE RET - ERROR_QUIET - ) - if(RET EQUAL 0) - string(STRIP "${wxWidgets_CXX_FLAGS}" wxWidgets_CXX_FLAGS) - separate_arguments(wxWidgets_CXX_FLAGS) - - DBG_MSG_V("wxWidgets_CXX_FLAGS=${wxWidgets_CXX_FLAGS}") - - # parse definitions from cxxflags; - # drop -D* from CXXFLAGS and the -D prefix - string(REGEX MATCHALL "-D[^;]+" - wxWidgets_DEFINITIONS "${wxWidgets_CXX_FLAGS}") - string(REGEX REPLACE "-D[^;]+(;|$)" "" - wxWidgets_CXX_FLAGS "${wxWidgets_CXX_FLAGS}") - string(REGEX REPLACE ";$" "" - wxWidgets_CXX_FLAGS "${wxWidgets_CXX_FLAGS}") - string(REPLACE "-D" "" - wxWidgets_DEFINITIONS "${wxWidgets_DEFINITIONS}") - - # parse include dirs from cxxflags; drop -I prefix - string(REGEX MATCHALL "-I[^;]+" - wxWidgets_INCLUDE_DIRS "${wxWidgets_CXX_FLAGS}") - string(REGEX REPLACE "-I[^;]+;" "" - wxWidgets_CXX_FLAGS "${wxWidgets_CXX_FLAGS}") - string(REPLACE "-I" "" - wxWidgets_INCLUDE_DIRS "${wxWidgets_INCLUDE_DIRS}") - - DBG_MSG_V("wxWidgets_DEFINITIONS=${wxWidgets_DEFINITIONS}") - DBG_MSG_V("wxWidgets_INCLUDE_DIRS=${wxWidgets_INCLUDE_DIRS}") - DBG_MSG_V("wxWidgets_CXX_FLAGS=${wxWidgets_CXX_FLAGS}") - - else() - set(wxWidgets_FOUND FALSE) - DBG_MSG_V( - "${wxWidgets_CONFIG_EXECUTABLE} --cxxflags FAILED with RET=${RET}") - endif() - - # run the wx-config program to get the libs - # - NOTE: wx-config doesn't verify that the libs requested exist - # it just produces the names. Maybe a TRY_COMPILE would - # be useful here... - string(REPLACE ";" "," - wxWidgets_FIND_COMPONENTS "${wxWidgets_FIND_COMPONENTS}") - execute_process( - COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}" - ${wxWidgets_SELECT_OPTIONS} --libs ${wxWidgets_FIND_COMPONENTS} - OUTPUT_VARIABLE wxWidgets_LIBRARIES - RESULT_VARIABLE RET - ERROR_QUIET - ) - if(RET EQUAL 0) - string(STRIP "${wxWidgets_LIBRARIES}" wxWidgets_LIBRARIES) - separate_arguments(wxWidgets_LIBRARIES) - string(REPLACE "-framework;" "-framework " - wxWidgets_LIBRARIES "${wxWidgets_LIBRARIES}") - string(REPLACE "-arch;" "-arch " - wxWidgets_LIBRARIES "${wxWidgets_LIBRARIES}") - string(REPLACE "-isysroot;" "-isysroot " - wxWidgets_LIBRARIES "${wxWidgets_LIBRARIES}") - - # extract linkdirs (-L) for rpath (i.e., LINK_DIRECTORIES) - string(REGEX MATCHALL "-L[^;]+" - wxWidgets_LIBRARY_DIRS "${wxWidgets_LIBRARIES}") - string(REPLACE "-L" "" - wxWidgets_LIBRARY_DIRS "${wxWidgets_LIBRARY_DIRS}") - - DBG_MSG_V("wxWidgets_LIBRARIES=${wxWidgets_LIBRARIES}") - DBG_MSG_V("wxWidgets_LIBRARY_DIRS=${wxWidgets_LIBRARY_DIRS}") - - else() - set(wxWidgets_FOUND FALSE) - DBG_MSG("${wxWidgets_CONFIG_EXECUTABLE} --libs ${wxWidgets_FIND_COMPONENTS} FAILED with RET=${RET}") - endif() - endif() - -#===================================================================== -# Neither UNIX_FIND_STYLE, nor WIN32_FIND_STYLE -#===================================================================== - else() - if(NOT wxWidgets_FIND_QUIETLY) - message(STATUS - "${CMAKE_CURRENT_LIST_FILE}(${CMAKE_CURRENT_LIST_LINE}): \n" - " Platform unknown/unsupported. It's neither WIN32 nor UNIX " - "find style." - ) - endif() - endif() -endif() - -# Debug output: -DBG_MSG("wxWidgets_FOUND : ${wxWidgets_FOUND}") -DBG_MSG("wxWidgets_INCLUDE_DIRS : ${wxWidgets_INCLUDE_DIRS}") -DBG_MSG("wxWidgets_LIBRARY_DIRS : ${wxWidgets_LIBRARY_DIRS}") -DBG_MSG("wxWidgets_LIBRARIES : ${wxWidgets_LIBRARIES}") -DBG_MSG("wxWidgets_CXX_FLAGS : ${wxWidgets_CXX_FLAGS}") -DBG_MSG("wxWidgets_USE_FILE : ${wxWidgets_USE_FILE}") - -#===================================================================== -#===================================================================== -include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(wxWidgets DEFAULT_MSG wxWidgets_FOUND) -# Maintain consistency with all other variables. -set(wxWidgets_FOUND ${WXWIDGETS_FOUND}) - -#===================================================================== -# Macros for use in wxWidgets apps. -# - This module will not fail to find wxWidgets based on the code -# below. Hence, it's required to check for validity of: -# -# wxWidgets_wxrc_EXECUTABLE -#===================================================================== - -# Resource file compiler. -find_program(wxWidgets_wxrc_EXECUTABLE wxrc - ${wxWidgets_ROOT_DIR}/utils/wxrc/vc_msw - DOC "Location of wxWidgets resource file compiler binary (wxrc)" - ) - -# -# WX_SPLIT_ARGUMENTS_ON( ...) -# -# Sets and to contain arguments to the left and right, -# respectively, of . -# -# Example usage: -# function(WXWIDGETS_ADD_RESOURCES outfiles) -# WX_SPLIT_ARGUMENTS_ON(OPTIONS wxrc_files wxrc_options ${ARGN}) -# ... -# endfunction() -# -# WXWIDGETS_ADD_RESOURCES(sources ${xrc_files} OPTIONS -e -o file.C) -# -# NOTE: This is a generic piece of code that should be renamed to -# SPLIT_ARGUMENTS_ON and put in a file serving the same purpose as -# FindPackageStandardArgs.cmake. At the time of this writing -# FindQt4.cmake has a QT4_EXTRACT_OPTIONS, which I basically copied -# here a bit more generalized. So, there are already two find modules -# using this approach. -# -function(WX_SPLIT_ARGUMENTS_ON _keyword _leftvar _rightvar) - # FIXME: Document that the input variables will be cleared. - #list(APPEND ${_leftvar} "") - #list(APPEND ${_rightvar} "") - set(${_leftvar} "") - set(${_rightvar} "") - - set(_doing_right FALSE) - foreach(element ${ARGN}) - if("${element}" STREQUAL "${_keyword}") - set(_doing_right TRUE) - else() - if(_doing_right) - list(APPEND ${_rightvar} "${element}") - else() - list(APPEND ${_leftvar} "${element}") - endif() - endif() - endforeach() - - set(${_leftvar} ${${_leftvar}} PARENT_SCOPE) - set(${_rightvar} ${${_rightvar}} PARENT_SCOPE) -endfunction() - -# -# WX_GET_DEPENDENCIES_FROM_XML( -# -# -# -# -# -# ) -# -# FIXME: Add documentation here... -# -function(WX_GET_DEPENDENCIES_FROM_XML - _depends - _match_patt - _clean_patt - _xml_contents - _depends_path - ) - - string(REGEX MATCHALL - ${_match_patt} - dep_file_list - "${${_xml_contents}}" - ) - foreach(dep_file ${dep_file_list}) - string(REGEX REPLACE ${_clean_patt} "" dep_file "${dep_file}") - - # make the file have an absolute path - if(NOT IS_ABSOLUTE "${dep_file}") - set(dep_file "${${_depends_path}}/${dep_file}") - endif() - - # append file to dependency list - list(APPEND ${_depends} "${dep_file}") - endforeach() - - set(${_depends} ${${_depends}} PARENT_SCOPE) -endfunction() - -# -# WXWIDGETS_ADD_RESOURCES( -# OPTIONS [NO_CPP_CODE]) -# -# Adds a custom command for resource file compilation of the -# and appends the output files to . -# -# Example usages: -# WXWIDGETS_ADD_RESOURCES(sources xrc/main_frame.xrc) -# WXWIDGETS_ADD_RESOURCES(sources ${xrc_files} OPTIONS -e -o altname.cxx) -# -function(WXWIDGETS_ADD_RESOURCES _outfiles) - WX_SPLIT_ARGUMENTS_ON(OPTIONS rc_file_list rc_options ${ARGN}) - - # Parse files for dependencies. - set(rc_file_list_abs "") - set(rc_depends "") - foreach(rc_file ${rc_file_list}) - get_filename_component(depends_path ${rc_file} PATH) - - get_filename_component(rc_file_abs ${rc_file} ABSOLUTE) - list(APPEND rc_file_list_abs "${rc_file_abs}") - - # All files have absolute paths or paths relative to the location - # of the rc file. - file(READ "${rc_file_abs}" rc_file_contents) - - # get bitmap/bitmap2 files - WX_GET_DEPENDENCIES_FROM_XML( - rc_depends - "]*>" - rc_file_contents - depends_path - ) - - # get url files - WX_GET_DEPENDENCIES_FROM_XML( - rc_depends - "]*>" - rc_file_contents - depends_path - ) - - # get wxIcon files - WX_GET_DEPENDENCIES_FROM_XML( - rc_depends - "]*class=\"wxIcon\"[^<]+" - "^]*>" - rc_file_contents - depends_path - ) - endforeach() - - # - # Parse options. - # - # If NO_CPP_CODE option specified, then produce .xrs file rather - # than a .cpp file (i.e., don't add the default --cpp-code option). - list(FIND rc_options NO_CPP_CODE index) - if(index EQUAL -1) - list(APPEND rc_options --cpp-code) - # wxrc's default output filename for cpp code. - set(outfile resource.cpp) - else() - list(REMOVE_AT rc_options ${index}) - # wxrc's default output filename for xrs file. - set(outfile resource.xrs) - endif() - - # Get output name for use in ADD_CUSTOM_COMMAND. - # - short option scanning - list(FIND rc_options -o index) - if(NOT index EQUAL -1) - math(EXPR filename_index "${index} + 1") - list(GET rc_options ${filename_index} outfile) - #list(REMOVE_AT rc_options ${index} ${filename_index}) - endif() - # - long option scanning - string(REGEX MATCH "--output=[^;]*" outfile_opt "${rc_options}") - if(outfile_opt) - string(REPLACE "--output=" "" outfile "${outfile_opt}") - endif() - #string(REGEX REPLACE "--output=[^;]*;?" "" rc_options "${rc_options}") - #string(REGEX REPLACE ";$" "" rc_options "${rc_options}") - - if(NOT IS_ABSOLUTE "${outfile}") - set(outfile "${CMAKE_CURRENT_BINARY_DIR}/${outfile}") - endif() - add_custom_command( - OUTPUT "${outfile}" - COMMAND ${wxWidgets_wxrc_EXECUTABLE} ${rc_options} ${rc_file_list_abs} - DEPENDS ${rc_file_list_abs} ${rc_depends} - ) - - # Add generated header to output file list. - list(FIND rc_options -e short_index) - list(FIND rc_options --extra-cpp-code long_index) - if(NOT short_index EQUAL -1 OR NOT long_index EQUAL -1) - get_filename_component(outfile_ext ${outfile} EXT) - string(REPLACE "${outfile_ext}" ".h" outfile_header "${outfile}") - list(APPEND ${_outfiles} "${outfile_header}") - set_source_files_properties( - "${outfile_header}" PROPERTIES GENERATED TRUE - ) - endif() - - # Add generated file to output file list. - list(APPEND ${_outfiles} "${outfile}") - - set(${_outfiles} ${${_outfiles}} PARENT_SCOPE) -endfunction() diff --git a/rpcs3/rpcs3_app.cpp b/rpcs3/rpcs3_app.cpp index 956c0513c6..b54e9f982f 100644 --- a/rpcs3/rpcs3_app.cpp +++ b/rpcs3/rpcs3_app.cpp @@ -37,8 +37,8 @@ #ifdef _MSC_VER #include "Emu/RSX/D3D12/D3D12GSRender.h" #endif -#ifdef _WIN32 #include "Emu/RSX/VK/VKGSRender.h" +#ifdef _WIN32 #include "Emu/Audio/XAudio2/XAudio2Thread.h" #endif #ifdef __linux__ @@ -149,9 +149,7 @@ void rpcs3_app::InitializeCallbacks() { case video_renderer::null: return std::make_unique("Null", size.first, size.second, RPCS3MainWin->GetAppIcon()); case video_renderer::opengl: return std::make_unique(size.first, size.second, RPCS3MainWin->GetAppIcon()); -#ifdef _WIN32 case video_renderer::vulkan: return std::make_unique("Vulkan", size.first, size.second, RPCS3MainWin->GetAppIcon()); -#endif #ifdef _MSC_VER case video_renderer::dx12: return std::make_unique("DirectX 12", size.first, size.second, RPCS3MainWin->GetAppIcon()); #endif @@ -165,9 +163,7 @@ void rpcs3_app::InitializeCallbacks() { case video_renderer::null: return std::make_shared(); case video_renderer::opengl: return std::make_shared(); -#ifdef _WIN32 case video_renderer::vulkan: return std::make_shared(); -#endif #ifdef _MSC_VER case video_renderer::dx12: return std::make_shared(); #endif diff --git a/rpcs3/rpcs3_automoc.cpp b/rpcs3/rpcs3_automoc.cpp new file mode 100644 index 0000000000..7fffb2c2c2 --- /dev/null +++ b/rpcs3/rpcs3_automoc.cpp @@ -0,0 +1,29 @@ +/* This file is autogenerated, do not edit*/ +#include "moc_basic_keyboard_handler.cpp" +#include "moc_basic_mouse_handler.cpp" +#include "moc_rpcs3_app.cpp" +#include "moc_audio_tab.cpp" +#include "moc_auto_pause_settings_dialog.cpp" +#include "moc_cg_disasm_window.cpp" +#include "moc_core_tab.cpp" +#include "moc_debugger_frame.cpp" +#include "moc_emu_settings.cpp" +#include "moc_game_list_frame.cpp" +#include "moc_graphics_tab.cpp" +#include "moc_gs_frame.cpp" +#include "moc_gui_settings.cpp" +#include "moc_gui_tab.cpp" +#include "moc_input_tab.cpp" +#include "moc_kernel_explorer.cpp" +#include "moc_log_frame.cpp" +#include "moc_main_window.cpp" +#include "moc_memory_string_searcher.cpp" +#include "moc_misc_tab.cpp" +#include "moc_msg_dialog_frame.cpp" +#include "moc_networking_tab.cpp" +#include "moc_pad_settings_dialog.cpp" +#include "moc_rsx_debugger.cpp" +#include "moc_save_data_utility.cpp" +#include "moc_settings_dialog.cpp" +#include "moc_system_tab.cpp" +#include "moc_welcome_dialog.cpp" diff --git a/rpcs3/rpcs3qt/emu_settings.cpp b/rpcs3/rpcs3qt/emu_settings.cpp index 4084ec6cd2..dadde64b5c 100644 --- a/rpcs3/rpcs3qt/emu_settings.cpp +++ b/rpcs3/rpcs3qt/emu_settings.cpp @@ -4,6 +4,18 @@ #include "Emu/System.h" #include "Utilities/Config.h" +#ifdef _MSC_VER +#include +#undef GetHwnd +#include +#include +#include +#endif + +#if defined(_WIN32) || defined(__linux__) +#include "Emu/RSX/VK/VKHelpers.h" +#endif + extern std::string g_cfg_defaults; //! Default settings grabbed from Utilities/Config.h inline std::string sstr(const QString& _in) { return _in.toUtf8().toStdString(); } @@ -103,6 +115,58 @@ static QStringList getOptions(cfg_location location) return values; } +Render_Creator::Render_Creator() +{ + // check for dx12 adapters +#ifdef _MSC_VER + Microsoft::WRL::ComPtr dxgi_factory; + supportsD3D12 = SUCCEEDED(CreateDXGIFactory(IID_PPV_ARGS(&dxgi_factory))); + + if (supportsD3D12) + { + supportsD3D12 = false; + IDXGIAdapter1* pAdapter = nullptr; + + for (UINT adapterIndex = 0; DXGI_ERROR_NOT_FOUND != dxgi_factory->EnumAdapters1(adapterIndex, &pAdapter); ++adapterIndex) + { + HMODULE D3D12Module = verify("d3d12.dll", LoadLibrary(L"d3d12.dll")); + PFN_D3D12_CREATE_DEVICE wrapD3D12CreateDevice = (PFN_D3D12_CREATE_DEVICE)GetProcAddress(D3D12Module, "D3D12CreateDevice"); + + if (SUCCEEDED(wrapD3D12CreateDevice(pAdapter, D3D_FEATURE_LEVEL_11_0, _uuidof(ID3D12Device), nullptr))) + { + //A device with D3D12 support found. Init data + supportsD3D12 = true; + + DXGI_ADAPTER_DESC desc; + pAdapter->GetDesc(&desc); + D3D12Adapters.append(QString::fromWCharArray(desc.Description)); + } + } + } +#endif + + // check for vulkan adapters + vk::context device_enum_context; + u32 instance_handle = device_enum_context.createInstance("RPCS3", true); + + if (instance_handle > 0) + { + device_enum_context.makeCurrentInstance(instance_handle); + std::vector& gpus = device_enum_context.enumerateDevices(); + + if (gpus.size() > 0) + { + //A device with vulkan support found. Init data + supportsVulkan = true; + + for (auto& gpu : gpus) + { + vulkanAdapters.append(qstr(gpu.name())); + } + } + } +} + emu_settings::emu_settings(const std::string& path) : QObject() { // Create config path if necessary diff --git a/rpcs3/rpcs3qt/emu_settings.h b/rpcs3/rpcs3qt/emu_settings.h index 6f1014da44..8f8003e082 100644 --- a/rpcs3/rpcs3qt/emu_settings.h +++ b/rpcs3/rpcs3qt/emu_settings.h @@ -12,18 +12,6 @@ #include #include -#ifdef _MSC_VER -#include -#undef GetHwnd -#include -#include -#include -#endif - -#ifdef _WIN32 -#include "Emu/RSX/VK/VKHelpers.h" -#endif - inline QString qstr(const std::string& _in) { return QString::fromUtf8(_in.data(), _in.size()); } struct Render_Creator @@ -36,60 +24,7 @@ struct Render_Creator QString render_D3D12 = QObject::tr("D3D12"); QString render_OpenGL = QObject::tr("OpenGL"); - Render_Creator() - { - // check for dx12 adapters -#ifdef _MSC_VER - Microsoft::WRL::ComPtr dxgi_factory; - supportsD3D12 = SUCCEEDED(CreateDXGIFactory(IID_PPV_ARGS(&dxgi_factory))); - - if (supportsD3D12) - { - supportsD3D12 = false; - IDXGIAdapter1* pAdapter = nullptr; - - for (UINT adapterIndex = 0; DXGI_ERROR_NOT_FOUND != dxgi_factory->EnumAdapters1(adapterIndex, &pAdapter); ++adapterIndex) - { - HMODULE D3D12Module = verify("d3d12.dll", LoadLibrary(L"d3d12.dll")); - PFN_D3D12_CREATE_DEVICE wrapD3D12CreateDevice = (PFN_D3D12_CREATE_DEVICE)GetProcAddress(D3D12Module, "D3D12CreateDevice"); - - if (SUCCEEDED(wrapD3D12CreateDevice(pAdapter, D3D_FEATURE_LEVEL_11_0, _uuidof(ID3D12Device), nullptr))) - { - //A device with D3D12 support found. Init data - supportsD3D12 = true; - - DXGI_ADAPTER_DESC desc; - pAdapter->GetDesc(&desc); - D3D12Adapters.append(QString::fromWCharArray(desc.Description)); - } - } - } -#endif - - // check for vulkan adapters -#ifdef _WIN32 - vk::context device_enum_context; - u32 instance_handle = device_enum_context.createInstance("RPCS3", true); - - if (instance_handle > 0) - { - device_enum_context.makeCurrentInstance(instance_handle); - std::vector& gpus = device_enum_context.enumerateDevices(); - - if (gpus.size() > 0) - { - //A device with vulkan support found. Init data - supportsVulkan = true; - - for (auto& gpu : gpus) - { - vulkanAdapters.append(qstr(gpu.name())); - } - } - } -#endif - - } + Render_Creator(); }; // Node location diff --git a/rsx_program_decompiler b/rsx_program_decompiler deleted file mode 160000 index de3b2056ed..0000000000 --- a/rsx_program_decompiler +++ /dev/null @@ -1 +0,0 @@ -Subproject commit de3b2056edb91a439d856f1a84817c433ac1293c