AxioDL
/
boo
mirror of https://github.com/AxioDL/boo.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #26 from lioncash/header 

General: Tidy up includes
This commit is contained in:
Phillip Stephens 2019-08-20 00:32:07 -07:00 committed by GitHub
parent fd503b4a11 baff71cdc3
commit 091371458d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
84 changed files with 337 additions and 215 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/boo/DeferredWindowEvents.hpp
View File

@ -1,8 +1,11 @@
#pragma once #pragma once
#include <boo/boo.hpp> #include <chrono>
#include <mutex>
#include <condition_variable> #include <condition_variable>
#include <mutex>
#include <vector>
#include "boo/IWindow.hpp"
#include "nxstl/condition_variable" #include "nxstl/condition_variable"
namespace boo { namespace boo {

7
include/boo/IApplication.hpp
View File

@ -1,11 +1,12 @@
#pragma once #pragma once
#include <memory> #include <memory>
#include <string> #include <string_view>
#include <vector> #include <vector>
#include "IWindow.hpp" #include "boo/IWindow.hpp"
#include "inputdev/DeviceFinder.hpp" #include "boo/System.hpp"
#include "boo/inputdev/DeviceFinder.hpp"
namespace boo { namespace boo {
class IApplication; class IApplication;

2
include/boo/IGraphicsContext.hpp
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include <memory>
#include <cstdint> #include <cstdint>
#include <memory>
namespace boo { namespace boo {
struct IGraphicsCommandQueue; struct IGraphicsCommandQueue;

5
include/boo/IWindow.hpp
View File

@ -1,10 +1,11 @@
#pragma once #pragma once
#include "System.hpp"
#include <memory>
#include <algorithm> #include <algorithm>
#include <memory>
#include <cstring> #include <cstring>
#include "boo/System.hpp"
#undef min #undef min
#undef max #undef max

2
include/boo/UWPViewProvider.hpp
View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "IApplication.hpp" #include "boo/IApplication.hpp"
namespace boo { namespace boo {

12
include/boo/audiodev/IAudioVoiceEngine.hpp
View File

@ -1,12 +1,16 @@
#pragma once #pragma once
#include "IAudioVoice.hpp" #include <cstddef>
#include "IAudioSubmix.hpp"
#include "IMIDIPort.hpp"
#include "boo/BooObject.hpp"
#include <memory> #include <memory>
#include <string>
#include <utility>
#include <vector> #include <vector>
#include "boo/BooObject.hpp"
#include "boo/audiodev/IAudioSubmix.hpp"
#include "boo/audiodev/IAudioVoice.hpp"
#include "boo/audiodev/IMIDIPort.hpp"
namespace boo { namespace boo {
struct IAudioVoiceEngine; struct IAudioVoiceEngine;

7
include/boo/audiodev/IMIDIPort.hpp
View File

@ -1,9 +1,10 @@
#pragma once #pragma once
#include <string> #include <cstddef>
#include <functional>
#include <vector>
#include <cstdint> #include <cstdint>
#include <functional>
#include <string>
#include <vector>
namespace boo { namespace boo {
struct IAudioVoiceEngine; struct IAudioVoiceEngine;

2
include/boo/audiodev/IMIDIReader.hpp
View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include <cstdlib> #include <cstddef>
#include <cstdint> #include <cstdint>
namespace boo { namespace boo {

4
include/boo/audiodev/MIDIDecoder.hpp
View File

@ -1,11 +1,9 @@
#pragma once #pragma once
#include "boo/audiodev/IMIDIReader.hpp"
#include "boo/audiodev/IMIDIPort.hpp"
#include <functional>
#include <vector> #include <vector>
namespace boo { namespace boo {
class IMIDIReader;
class MIDIDecoder { class MIDIDecoder {
IMIDIReader& m_out; IMIDIReader& m_out;

1
include/boo/audiodev/MIDIEncoder.hpp
View File

@ -1,7 +1,6 @@
#pragma once #pragma once
#include "boo/audiodev/IMIDIReader.hpp" #include "boo/audiodev/IMIDIReader.hpp"
#include "boo/audiodev/IMIDIPort.hpp"
namespace boo { namespace boo {

2
include/boo/boo.hpp
View File

@ -1,5 +1,6 @@
#pragma once #pragma once
#include "DeferredWindowEvents.hpp"
#include "IApplication.hpp" #include "IApplication.hpp"
#include "IWindow.hpp" #include "IWindow.hpp"
#include "inputdev/DeviceFinder.hpp" #include "inputdev/DeviceFinder.hpp"
@ -9,4 +10,3 @@
#include "inputdev/NintendoPowerA.hpp" #include "inputdev/NintendoPowerA.hpp"
#include "graphicsdev/IGraphicsCommandQueue.hpp" #include "graphicsdev/IGraphicsCommandQueue.hpp"
#include "graphicsdev/IGraphicsDataFactory.hpp" #include "graphicsdev/IGraphicsDataFactory.hpp"
#include "DeferredWindowEvents.hpp"

10
include/boo/graphicsdev/D3D.hpp
View File

@ -2,12 +2,12 @@
#if _WIN32 #if _WIN32
#include "IGraphicsDataFactory.hpp" #include <cstddef>
#include "IGraphicsCommandQueue.hpp"
#include "boo/IGraphicsContext.hpp"
#include "boo/System.hpp"
#include <vector> #include <vector>
#include <unordered_set>
#include "boo/BooObject.hpp"
#include "boo/System.hpp"
#include "boo/graphicsdev/IGraphicsDataFactory.hpp"
using pD3DCreateBlob = HRESULT(WINAPI*)(SIZE_T Size, ID3DBlob** ppBlob); using pD3DCreateBlob = HRESULT(WINAPI*)(SIZE_T Size, ID3DBlob** ppBlob);
extern pD3DCreateBlob D3DCreateBlobPROC; extern pD3DCreateBlob D3DCreateBlobPROC;

9
include/boo/graphicsdev/GL.hpp
View File

@ -1,10 +1,11 @@
#pragma once #pragma once
#if BOO_HAS_GL #if BOO_HAS_GL
#include "IGraphicsDataFactory.hpp" #include <cstdint>
#include "IGraphicsCommandQueue.hpp"
#include "boo/IGraphicsContext.hpp" #include "boo/BooObject.hpp"
#include "GLSLMacros.hpp" #include "boo/graphicsdev/IGraphicsCommandQueue.hpp"
#include "boo/graphicsdev/IGraphicsDataFactory.hpp"
namespace boo { namespace boo {
struct BaseGraphicsData; struct BaseGraphicsData;

9
include/boo/graphicsdev/IGraphicsCommandQueue.hpp
View File

@ -1,9 +1,12 @@
#pragma once #pragma once
#include "IGraphicsDataFactory.hpp"
#include "boo/IWindow.hpp"
#include <functional>
#include <array> #include <array>
#include <cstddef>
#include <functional>
#include "boo/BooObject.hpp"
#include "boo/IWindow.hpp"
#include "boo/graphicsdev/IGraphicsDataFactory.hpp"
namespace boo { namespace boo {

9
include/boo/graphicsdev/IGraphicsDataFactory.hpp
View File

@ -1,12 +1,13 @@
#pragma once #pragma once
#include <memory> #include <cstddef>
#include <functional>
#include <cstdint> #include <cstdint>
#include <functional>
#include <initializer_list>
#include <vector> #include <vector>
#include "boo/System.hpp"
#include "boo/ThreadLocalPtr.hpp"
#include "boo/BooObject.hpp" #include "boo/BooObject.hpp"
#include "boo/System.hpp"
#ifdef __SWITCH__ #ifdef __SWITCH__
#include <ctype.h> #include <ctype.h>

6
include/boo/graphicsdev/Metal.hpp
View File

@ -2,9 +2,11 @@
#ifdef __APPLE__ #ifdef __APPLE__
#if BOO_HAS_METAL #if BOO_HAS_METAL
#include "IGraphicsDataFactory.hpp" #include "boo/BooObject.hpp"
#include "IGraphicsCommandQueue.hpp"
#include "boo/IGraphicsContext.hpp" #include "boo/IGraphicsContext.hpp"
#include "boo/System.hpp"
#include "boo/graphicsdev/IGraphicsCommandQueue.hpp"
#include "boo/graphicsdev/IGraphicsDataFactory.hpp"
namespace boo { namespace boo {
struct BaseGraphicsData; struct BaseGraphicsData;

9
include/boo/graphicsdev/NX.hpp
View File

@ -1,9 +1,12 @@
#pragma once #pragma once
#if BOO_HAS_NX #if BOO_HAS_NX
#include "IGraphicsDataFactory.hpp" #include <unordered_map>
#include "IGraphicsCommandQueue.hpp"
#include "nx_compiler.hpp" #include "boo/BooObject.hpp"
#include "boo/graphicsdev/IGraphicsCommandQueue.hpp"
#include "boo/graphicsdev/IGraphicsDataFactory.hpp"
#include "boo/graphicsdev/nx_compiler.hpp"
#include <switch/nvidia/fence.h> #include <switch/nvidia/fence.h>

14
include/boo/graphicsdev/Vulkan.hpp
View File

@ -1,15 +1,15 @@
#pragma once #pragma once
#if BOO_HAS_VULKAN #if BOO_HAS_VULKAN
#include "IGraphicsDataFactory.hpp"
#include "IGraphicsCommandQueue.hpp"
#include "boo/IGraphicsContext.hpp"
#include "GLSLMacros.hpp"
#include <vector>
#include <unordered_set>
#include <unordered_map>
#include <mutex> #include <mutex>
#include <queue> #include <queue>
#include <unordered_map>
#include <vector>
#include "boo/BooObject.hpp"
#include "boo/IGraphicsContext.hpp"
#include "boo/System.hpp"
#include "boo/graphicsdev/IGraphicsDataFactory.hpp"
#include "boo/graphicsdev/VulkanDispatchTable.hpp" #include "boo/graphicsdev/VulkanDispatchTable.hpp"
/* Forward-declare handle type for Vulkan Memory Allocator */ /* Forward-declare handle type for Vulkan Memory Allocator */

7
include/boo/inputdev/DeviceBase.hpp
View File

@ -1,11 +1,12 @@
#pragma once #pragma once
#include <cstdint> #include <cstddef>
#include <cstdlib>
#include <cstdio> #include <cstdio>
#include <cstdint>
#include <memory> #include <memory>
#include <vector>
#include <mutex> #include <mutex>
#include <vector>
#include "nxstl/mutex" #include "nxstl/mutex"
#include "boo/System.hpp" #include "boo/System.hpp"

1
include/boo/inputdev/DeviceFinder.hpp
View File

@ -4,6 +4,7 @@
#include <mutex> #include <mutex>
#include <string> #include <string>
#include <unordered_set> #include <unordered_set>
#include "boo/inputdev/DeviceSignature.hpp" #include "boo/inputdev/DeviceSignature.hpp"
#include "boo/inputdev/DeviceToken.hpp" #include "boo/inputdev/DeviceToken.hpp"
#include "boo/inputdev/IHIDListener.hpp" #include "boo/inputdev/IHIDListener.hpp"

5
include/boo/inputdev/DeviceSignature.hpp
View File

@ -1,10 +1,11 @@
#pragma once #pragma once
#include <vector> #include <cstdint>
#include <functional> #include <functional>
#include <typeindex>
#include <memory> #include <memory>
#include <string> #include <string>
#include <typeindex>
#include <vector>
namespace boo { namespace boo {

6
include/boo/inputdev/DeviceToken.hpp
View File

@ -1,8 +1,10 @@
#pragma once #pragma once
#include <memory>
#include <string> #include <string>
#include "DeviceBase.hpp"
#include "DeviceSignature.hpp" #include "boo/inputdev/DeviceBase.hpp"
#include "boo/inputdev/DeviceSignature.hpp"
namespace boo { namespace boo {

5
include/boo/inputdev/DolphinSmashAdapter.hpp
View File

@ -1,8 +1,9 @@
#pragma once #pragma once
#include <cstdint> #include <cstdint>
#include "DeviceBase.hpp"
#include "../System.hpp" #include "boo/System.hpp"
#include "boo/inputdev/DeviceBase.hpp"
namespace boo { namespace boo {

5
include/boo/inputdev/DualshockPad.hpp
View File

@ -1,8 +1,9 @@
#pragma once #pragma once
#include <cstdint> #include <cstdint>
#include <type_traits>
#include "DeviceBase.hpp"
#include "boo/System.hpp" #include "boo/System.hpp"
#include "boo/inputdev/DeviceBase.hpp"
namespace boo { namespace boo {

8
include/boo/inputdev/GenericPad.hpp
View File

@ -1,9 +1,9 @@
#pragma once #pragma once
#include "DeviceBase.hpp" #include <functional>
#include "HIDParser.hpp"
#include <map> #include "boo/inputdev/DeviceBase.hpp"
#include <mutex> #include "boo/inputdev/HIDParser.hpp"
namespace boo { namespace boo {

10
include/boo/inputdev/HIDParser.hpp
View File

@ -1,10 +1,14 @@
#pragma once #pragma once
#include "boo/System.hpp" #include <cstddef>
#include <vector> #include <cstdint>
#include <stack>
#include <functional> #include <functional>
#include <memory> #include <memory>
#include <stack>
#include <utility>
#include <vector>
#include "boo/System.hpp"
#if _WIN32 #if _WIN32
#include <hidsdi.h> #include <hidsdi.h>

7
include/boo/inputdev/IHIDListener.hpp
View File

@ -1,8 +1,11 @@
#pragma once #pragma once
#include <unordered_map> #include <memory>
#include <mutex> #include <mutex>
#include "DeviceToken.hpp" #include <unordered_map>
#include <utility>
#include "boo/inputdev/DeviceToken.hpp"
namespace boo { namespace boo {
class DeviceFinder; class DeviceFinder;

6
include/boo/inputdev/XInputPad.hpp
View File

@ -1,8 +1,10 @@
#pragma once #pragma once
#include "DeviceBase.hpp" #include <cstdint>
#include "DeviceSignature.hpp"
#include "boo/System.hpp" #include "boo/System.hpp"
#include "boo/inputdev/DeviceBase.hpp"
#include "boo/inputdev/DeviceSignature.hpp"
namespace boo { namespace boo {

4
lib/Common.hpp
View File

@ -1,8 +1,10 @@
#pragma once #pragma once
#include "boo/BooObject.hpp" #include <cstddef>
#include <iterator> #include <iterator>
#include "boo/BooObject.hpp"
namespace boo { namespace boo {
/** Linked-list iterator shareable by ListNode types. */ /** Linked-list iterator shareable by ListNode types. */

5
lib/audiodev/AQS.cpp
View File

@ -1,6 +1,7 @@
#include "AudioVoiceEngine.hpp" #include "lib/audiodev/AudioVoiceEngine.hpp"
#include "boo/IApplication.hpp" #include "boo/IApplication.hpp"
#include "../CFPointer.hpp" #include "lib/CFPointer.hpp"
#include <AudioToolbox/AudioToolbox.h> #include <AudioToolbox/AudioToolbox.h>
#include <CoreMIDI/CoreMIDI.h> #include <CoreMIDI/CoreMIDI.h>

4
lib/audiodev/AudioMatrix.cpp
View File

@ -1,5 +1,5 @@
#include "AudioMatrix.hpp" #include "lib/audiodev/AudioMatrix.hpp"
#include "AudioVoiceEngine.hpp" #include "lib/audiodev/AudioVoiceEngine.hpp"
#include <cstring> #include <cstring>
namespace boo { namespace boo {

9
lib/audiodev/AudioMatrix.hpp
View File

@ -1,10 +1,11 @@
#pragma once #pragma once
#include "boo/audiodev/IAudioVoice.hpp"
#include <vector>
#include <cstdint>
#include <limits.h>
#include <cfloat> #include <cfloat>
#include <climits>
#include <cstddef>
#include <cstdint>
#include "boo/audiodev/IAudioVoice.hpp"
#if __SSE__ #if __SSE__
#include <immintrin.h> #include <immintrin.h>

5
lib/audiodev/AudioMatrixSSE.cpp
View File

@ -1,6 +1,5 @@
#include "AudioMatrix.hpp" #include "lib/audiodev/AudioMatrix.hpp"
#include "AudioVoiceEngine.hpp" #include "lib/audiodev/AudioVoiceEngine.hpp"
#include <cstring>
#include <immintrin.h> #include <immintrin.h>

8
lib/audiodev/AudioSubmix.cpp
View File

@ -1,7 +1,7 @@
#include "AudioSubmix.hpp" #include "lib/audiodev/AudioSubmix.hpp"
#include "AudioVoiceEngine.hpp" #include "lib/audiodev/AudioVoice.hpp"
#include "AudioVoice.hpp" #include "lib/audiodev/AudioVoiceEngine.hpp"
#include <cstring>
#include <algorithm> #include <algorithm>
#undef min #undef min

7
lib/audiodev/AudioSubmix.hpp
View File

@ -1,12 +1,15 @@
#pragma once #pragma once
#include "boo/audiodev/IAudioSubmix.hpp"
#include <array> #include <array>
#include <cstddef>
#include <cstdint>
#include <list> #include <list>
#include <mutex> #include <mutex>
#include <unordered_map> #include <unordered_map>
#include <vector> #include <vector>
#include "Common.hpp"
#include "boo/audiodev/IAudioSubmix.hpp"
#include "lib/audiodev/Common.hpp"
#if __SSE__ #if __SSE__
#include <immintrin.h> #include <immintrin.h>

10
lib/audiodev/AudioVoice.hpp
View File

@ -1,12 +1,14 @@
#pragma once #pragma once
#include <soxr.h>
#include <mutex> #include <mutex>
#include <unordered_map> #include <unordered_map>
#include "boo/audiodev/IAudioVoice.hpp" #include "boo/audiodev/IAudioVoice.hpp"
#include "AudioMatrix.hpp" #include "lib/audiodev/AudioMatrix.hpp"
#include "AudioVoiceEngine.hpp" #include "lib/audiodev/AudioVoiceEngine.hpp"
#include "Common.hpp" #include "lib/audiodev/Common.hpp"
#include <soxr.h>
struct AudioUnitVoiceEngine; struct AudioUnitVoiceEngine;
struct VSTVoiceEngine; struct VSTVoiceEngine;

4
lib/audiodev/AudioVoiceEngine.cpp
View File

@ -1,5 +1,7 @@
#include "AudioVoiceEngine.hpp" #include "lib/audiodev/AudioVoiceEngine.hpp"
#include <cassert> #include <cassert>
#include <cstring>
namespace boo { namespace boo {

18
lib/audiodev/AudioVoiceEngine.hpp
View File

@ -1,12 +1,18 @@
#pragma once #pragma once
#include "boo/audiodev/IAudioVoiceEngine.hpp" #include <cstddef>
#include "LtRtProcessing.hpp" #include <cstdint>
#include "Common.hpp" #include <list>
#include "AudioVoice.hpp" #include <memory>
#include "AudioSubmix.hpp"
#include <functional>
#include <mutex> #include <mutex>
#include <vector>
#include "boo/BooObject.hpp"
#include "boo/audiodev/IAudioVoiceEngine.hpp"
#include "lib/audiodev/AudioSubmix.hpp"
#include "lib/audiodev/AudioVoice.hpp"
#include "lib/audiodev/Common.hpp"
#include "lib/audiodev/LtRtProcessing.hpp"
namespace boo { namespace boo {

2
lib/audiodev/Common.hpp
View File

@ -1,8 +1,8 @@
#pragma once #pragma once
#include <soxr.h> #include <soxr.h>
#include "../Common.hpp"
#include "boo/audiodev/IAudioVoice.hpp" #include "boo/audiodev/IAudioVoice.hpp"
#include "lib/Common.hpp"
namespace boo { namespace boo {

8
lib/audiodev/LinuxMidi.hpp
View File

@ -1,11 +1,13 @@
#pragma once #pragma once
#include "AudioVoiceEngine.hpp" #include <csignal>
#include "logvisor/logvisor.hpp"
#include <thread> #include <thread>
#include <unordered_map>
#include "lib/audiodev/AudioVoiceEngine.hpp"
#include <alsa/asoundlib.h> #include <alsa/asoundlib.h>
#include <signal.h> #include <logvisor/logvisor.hpp>
namespace boo { namespace boo {
extern logvisor::Module ALSALog; extern logvisor::Module ALSALog;

6
lib/audiodev/LtRtProcessing.hpp
View File

@ -1,9 +1,11 @@
#pragma once #pragma once
#include <cstdint>
#include <memory>
#include "boo/System.hpp" #include "boo/System.hpp"
#include "boo/audiodev/IAudioVoice.hpp" #include "boo/audiodev/IAudioVoice.hpp"
#include "Common.hpp" #include "lib/audiodev/Common.hpp"
#include <memory>
#if INTEL_IPP #if INTEL_IPP
#include "ipp.h" #include "ipp.h"

3
lib/audiodev/MIDICommon.cpp
View File

@ -1,4 +1,5 @@
#include "MIDICommon.hpp" #include "lib/audiodev/MIDICommon.hpp"
#include "boo/audiodev/IMIDIPort.hpp" #include "boo/audiodev/IMIDIPort.hpp"
namespace boo { namespace boo {

7
lib/audiodev/MIDIDecoder.cpp
View File

@ -1,8 +1,11 @@
#include "boo/audiodev/MIDIDecoder.hpp" #include "boo/audiodev/MIDIDecoder.hpp"
#include "MIDICommon.hpp"
#include <memory>
#include <algorithm> #include <algorithm>
#include "boo/audiodev/IMIDIReader.hpp"
#include "lib/audiodev/MIDICommon.hpp"
namespace boo { namespace boo {
constexpr uint8_t clamp7(uint8_t val) { return std::max(0, std::min(127, int(val))); } constexpr uint8_t clamp7(uint8_t val) { return std::max(0, std::min(127, int(val))); }

4
lib/audiodev/MIDIEncoder.cpp
View File

@ -1,5 +1,7 @@
#include "boo/audiodev/MIDIEncoder.hpp" #include "boo/audiodev/MIDIEncoder.hpp"
#include "MIDICommon.hpp"
#include "boo/audiodev/IMIDIPort.hpp"
#include "lib/audiodev/MIDICommon.hpp"
namespace boo { namespace boo {

9
lib/audiodev/PulseAudio.cpp
View File

@ -1,8 +1,9 @@
#include "AudioVoiceEngine.hpp" #include "lib/audiodev/AudioVoiceEngine.hpp"
#include "logvisor/logvisor.hpp"
#include "boo/boo.hpp"
#include "LinuxMidi.hpp"
#include "boo/boo.hpp"
#include "lib/audiodev/LinuxMidi.hpp"
#include <logvisor/logvisor.hpp>
#include <pulse/pulseaudio.h> #include <pulse/pulseaudio.h>
#include <unistd.h> #include <unistd.h>

10
lib/audiodev/WASAPI.cpp
View File

@ -1,14 +1,16 @@
#include "../win/Win32Common.hpp" #include "lib/win/Win32Common.hpp"
#include "AudioVoiceEngine.hpp"
#include "logvisor/logvisor.hpp" #include <iterator>
#include "boo/IApplication.hpp" #include "boo/IApplication.hpp"
#include "lib/audiodev/AudioVoiceEngine.hpp"
#include <Mmdeviceapi.h> #include <Mmdeviceapi.h>
#include <Audioclient.h> #include <Audioclient.h>
#include <mmsystem.h> #include <mmsystem.h>
#include <Functiondiscoverykeys_devpkey.h> #include <Functiondiscoverykeys_devpkey.h>
#include <iterator> #include <logvisor/logvisor.hpp>
#ifdef TE_VIRTUAL_MIDI #ifdef TE_VIRTUAL_MIDI
#include <teVirtualMIDI.h> #include <teVirtualMIDI.h>

7
lib/audiodev/WAVOut.cpp
View File

@ -1,6 +1,9 @@
#include "AudioVoiceEngine.hpp" #include "lib/audiodev/AudioVoiceEngine.hpp"
#include "logvisor/logvisor.hpp"
#include <cstdio>
#include "boo/audiodev/IAudioVoiceEngine.hpp" #include "boo/audiodev/IAudioVoiceEngine.hpp"
#include <logvisor/logvisor.hpp>
namespace boo { namespace boo {

2
lib/graphicsdev/Common.hpp
View File

@ -14,7 +14,7 @@
#include "boo/graphicsdev/IGraphicsDataFactory.hpp" #include "boo/graphicsdev/IGraphicsDataFactory.hpp"
#include "boo/graphicsdev/IGraphicsCommandQueue.hpp" #include "boo/graphicsdev/IGraphicsCommandQueue.hpp"
#include "../Common.hpp" #include "lib/Common.hpp"
namespace boo { namespace boo {

4
lib/graphicsdev/D3D11.cpp
View File

@ -1,12 +1,12 @@
#include "../win/Win32Common.hpp" #include "../win/Win32Common.hpp"
#include "boo/graphicsdev/D3D.hpp" #include "boo/graphicsdev/D3D.hpp"
#include "boo/graphicsdev/IGraphicsCommandQueue.hpp"
#include "boo/IGraphicsContext.hpp" #include "boo/IGraphicsContext.hpp"
#include "Common.hpp" #include "lib/graphicsdev/Common.hpp"
#include <algorithm> #include <algorithm>
#include <atomic> #include <atomic>
#include <condition_variable> #include <condition_variable>
#include <forward_list>
#include <mutex> #include <mutex>
#include <thread> #include <thread>
#include <vector> #include <vector>

7
lib/graphicsdev/GL.cpp
View File

@ -1,7 +1,10 @@
#include "boo/graphicsdev/GL.hpp" #include "boo/graphicsdev/GL.hpp"
#include "boo/graphicsdev/glew.h" #include "boo/graphicsdev/glew.h"
#include "boo/graphicsdev/GLSLMacros.hpp"
#include "boo/IApplication.hpp" #include "boo/IApplication.hpp"
#include "Common.hpp" #include "boo/IGraphicsContext.hpp"
#include "lib/graphicsdev/Common.hpp"
#include <array> #include <array>
#include <condition_variable> #include <condition_variable>
@ -15,7 +18,7 @@
#include <logvisor/logvisor.hpp> #include <logvisor/logvisor.hpp>
#if _WIN32 #if _WIN32
#include "../win/WinCommon.hpp" #include "lib/win/WinCommon.hpp"
#endif #endif
#undef min #undef min

2
lib/graphicsdev/GLX.cpp
View File

@ -1,5 +1,5 @@
#include "boo/graphicsdev/glxew.h" #include "boo/graphicsdev/glxew.h"
#include "logvisor/logvisor.hpp" #include <logvisor/logvisor.hpp>
namespace boo { namespace boo {
static logvisor::Module Log("boo::GLX"); static logvisor::Module Log("boo::GLX");

13
lib/graphicsdev/Metal.mm
View File

@ -1,16 +1,17 @@
#include "../mac/CocoaCommon.hpp" #include "lib/mac/CocoaCommon.hpp"
#if BOO_HAS_METAL #if BOO_HAS_METAL
#include "logvisor/logvisor.hpp"
#include "boo/IApplication.hpp" #include "boo/IApplication.hpp"
#include "boo/graphicsdev/Metal.hpp"
#include "boo/IGraphicsContext.hpp" #include "boo/IGraphicsContext.hpp"
#include "Common.hpp" #include "boo/graphicsdev/Metal.hpp"
#include <vector> #include "lib/graphicsdev/Common.hpp"
#include <unordered_map> #include <unordered_map>
#include <unordered_set> #include <unordered_set>
#include "xxhash/xxhash.h" #include <vector>
#include <logvisor/logvisor.hpp>
#if !__has_feature(objc_arc) #if !__has_feature(objc_arc)
#error ARC Required #error ARC Required

13
lib/graphicsdev/Vulkan.cpp
View File

@ -1,15 +1,18 @@
#include "boo/graphicsdev/Vulkan.hpp" #include "boo/graphicsdev/Vulkan.hpp"
#include "boo/IGraphicsContext.hpp"
#include <vector>
#include <array> #include <array>
#include <cmath> #include <cmath>
#include <vector>
#include <glslang/Public/ShaderLang.h> #include <glslang/Public/ShaderLang.h>
#include <StandAlone/ResourceLimits.h> #include <StandAlone/ResourceLimits.h>
#include <SPIRV/GlslangToSpv.h> #include <SPIRV/GlslangToSpv.h>
#include <SPIRV/disassemble.h> #include <SPIRV/disassemble.h>
#include "boo/IGraphicsContext.hpp"
#include "boo/graphicsdev/GLSLMacros.hpp" #include "boo/graphicsdev/GLSLMacros.hpp"
#include "Common.hpp" #include "boo/graphicsdev/IGraphicsCommandQueue.hpp"
#include "xxhash/xxhash.h" #include "lib/graphicsdev/Common.hpp"
#define AMD_PAL_HACK 1 #define AMD_PAL_HACK 1
@ -17,7 +20,7 @@
#define VMA_STATIC_VULKAN_FUNCTIONS 0 #define VMA_STATIC_VULKAN_FUNCTIONS 0
#include "vk_mem_alloc.h" #include "vk_mem_alloc.h"
#include "logvisor/logvisor.hpp" #include <logvisor/logvisor.hpp>
#define BOO_VK_MAX_DESCRIPTOR_SETS 65536 #define BOO_VK_MAX_DESCRIPTOR_SETS 65536

13
lib/graphicsdev/nx/NX.cpp
View File

@ -1,9 +1,13 @@
#include "logvisor/logvisor.hpp"
#include "boo/graphicsdev/NX.hpp" #include "boo/graphicsdev/NX.hpp"
#include <algorithm>
#include <cassert>
#include <cstdio>
#include <cstring>
#include "boo/IGraphicsContext.hpp" #include "boo/IGraphicsContext.hpp"
#include "boo/graphicsdev/GLSLMacros.hpp" #include "boo/graphicsdev/GLSLMacros.hpp"
#include "../Common.hpp" #include "lib/graphicsdev/Common.hpp"
#include "xxhash/xxhash.h"
#include "main/shaderobj.h" #include "main/shaderobj.h"
#include "st_program.h" #include "st_program.h"
@ -19,6 +23,9 @@ extern "C" {
#include "gallium/winsys/nouveau/switch/nouveau_switch_public.h" #include "gallium/winsys/nouveau/switch/nouveau_switch_public.h"
} }
#include <logvisor/logvisor.hpp>
#include <xxhash/xxhash.h>
#include <switch.h> #include <switch.h>
namespace boo { namespace boo {

3
lib/inputdev/DeviceBase.cpp
View File

@ -1,7 +1,6 @@
#include "boo/inputdev/DeviceBase.hpp" #include "boo/inputdev/DeviceBase.hpp"
#include "boo/inputdev/DeviceToken.hpp" #include "boo/inputdev/DeviceToken.hpp"
#include "IHIDDevice.hpp" #include "lib/inputdev/IHIDDevice.hpp"
#include <cstdarg>
namespace boo { namespace boo {

2
lib/inputdev/DeviceSignature.cpp
View File

@ -1,7 +1,7 @@
#include "boo/inputdev/DeviceSignature.hpp" #include "boo/inputdev/DeviceSignature.hpp"
#include "boo/inputdev/DeviceToken.hpp" #include "boo/inputdev/DeviceToken.hpp"
#include "boo/inputdev/GenericPad.hpp" #include "boo/inputdev/GenericPad.hpp"
#include "IHIDDevice.hpp" #include "lib/inputdev/IHIDDevice.hpp"
namespace boo { namespace boo {

1
lib/inputdev/DolphinSmashAdapter.cpp
View File

@ -1,5 +1,6 @@
#include "boo/inputdev/DolphinSmashAdapter.hpp" #include "boo/inputdev/DolphinSmashAdapter.hpp"
#include "boo/inputdev/DeviceSignature.hpp" #include "boo/inputdev/DeviceSignature.hpp"
#include <cstdio> #include <cstdio>
#include <cstring> #include <cstring>

5
lib/inputdev/DualshockPad.cpp
View File

@ -1,10 +1,11 @@
#include "boo/inputdev/DualshockPad.hpp" #include "boo/inputdev/DualshockPad.hpp"
#include "boo/inputdev/DeviceSignature.hpp" #include "boo/inputdev/DeviceSignature.hpp"
#define _USE_MATH_DEFINES #define _USE_MATH_DEFINES
#include <cmath> #include <cmath>
#include <iostream>
#include <cstdio> #include <cstdio>
#include <memory.h> #include <cstring>
#include <iostream>
#ifdef _MSC_VER #ifdef _MSC_VER
inline uint16_t bswap16(uint16_t val) { return _byteswap_ushort(val); } inline uint16_t bswap16(uint16_t val) { return _byteswap_ushort(val); }

9
lib/inputdev/HIDDeviceIOKit.cpp
View File

@ -1,9 +1,12 @@
#include "IHIDDevice.hpp" #include "lib/inputdev/IHIDDevice.hpp"
#include <thread>
#include "lib/inputdev/IOKitPointer.hpp"
#include <IOKit/hid/IOHIDLib.h> #include <IOKit/hid/IOHIDLib.h>
#include <IOKit/hid/IOHIDDevicePlugin.h> #include <IOKit/hid/IOHIDDevicePlugin.h>
#include <IOKit/usb/IOUSBLib.h> #include <IOKit/usb/IOUSBLib.h>
#include "IOKitPointer.hpp"
#include <thread>
namespace boo { namespace boo {

2
lib/inputdev/HIDDeviceNX.cpp
View File

@ -1,4 +1,4 @@
#include "IHIDDevice.hpp" #include "lib/inputdev/IHIDDevice.hpp"
namespace boo { namespace boo {

4
lib/inputdev/HIDDeviceUWP.cpp
View File

@ -1,5 +1,7 @@
#define _CRT_SECURE_NO_WARNINGS 1 /* STFU MSVC */ #define _CRT_SECURE_NO_WARNINGS 1 /* STFU MSVC */
#include "IHIDDevice.hpp"
#include "lib/inputdev/IHIDDevice.hpp"
#include "boo/inputdev/DeviceToken.hpp" #include "boo/inputdev/DeviceToken.hpp"
#include "boo/inputdev/DeviceBase.hpp" #include "boo/inputdev/DeviceBase.hpp"

20
lib/inputdev/HIDDeviceUdev.cpp
View File

@ -1,22 +1,24 @@
#include "IHIDDevice.hpp" #include "lib/inputdev/IHIDDevice.hpp"
#include <condition_variable>
#include <cstdio>
#include <cstring>
#include <mutex>
#include <thread>
#include "boo/inputdev/DeviceToken.hpp" #include "boo/inputdev/DeviceToken.hpp"
#include "boo/inputdev/DeviceBase.hpp" #include "boo/inputdev/DeviceBase.hpp"
#include <thread> #include "boo/inputdev/HIDParser.hpp"
#include <mutex>
#include <condition_variable>
#include <cstdio> #include <fcntl.h>
#include <libudev.h> #include <libudev.h>
#include <stropts.h>
#include <linux/usb/ch9.h> #include <linux/usb/ch9.h>
#include <linux/usbdevice_fs.h> #include <linux/usbdevice_fs.h>
#include <linux/input.h> #include <linux/input.h>
#include <linux/hidraw.h> #include <linux/hidraw.h>
#include <fcntl.h> #include <stropts.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <unistd.h> #include <unistd.h>
#include <cstring>
#include "boo/inputdev/HIDParser.hpp"
namespace boo { namespace boo {

3
lib/inputdev/HIDDeviceWinUSB.cpp
View File

@ -1,5 +1,6 @@
#define _CRT_SECURE_NO_WARNINGS 1 /* STFU MSVC */ #define _CRT_SECURE_NO_WARNINGS 1 /* STFU MSVC */
#include "IHIDDevice.hpp" #include "lib/inputdev/IHIDDevice.hpp"
#include "boo/inputdev/DeviceToken.hpp" #include "boo/inputdev/DeviceToken.hpp"
#include "boo/inputdev/DeviceBase.hpp" #include "boo/inputdev/DeviceBase.hpp"

1
lib/inputdev/HIDListenerUWP.cpp
View File

@ -1,4 +1,5 @@
#define _CRT_SECURE_NO_WARNINGS 1 /* STFU MSVC */ #define _CRT_SECURE_NO_WARNINGS 1 /* STFU MSVC */
#include "boo/inputdev/IHIDListener.hpp" #include "boo/inputdev/IHIDListener.hpp"
#include "boo/inputdev/DeviceFinder.hpp" #include "boo/inputdev/DeviceFinder.hpp"

7
lib/inputdev/HIDListenerWinUSB.cpp
View File

@ -1,10 +1,13 @@
#define _CRT_SECURE_NO_WARNINGS 1 /* STFU MSVC */ #define _CRT_SECURE_NO_WARNINGS 1 /* STFU MSVC */
#include "boo/inputdev/IHIDListener.hpp" #include "boo/inputdev/IHIDListener.hpp"
#include "boo/inputdev/DeviceFinder.hpp"
#include "boo/inputdev/XInputPad.hpp"
#include <cstring> #include <cstring>
#include <thread> #include <thread>
#include "boo/inputdev/DeviceFinder.hpp"
#include "boo/inputdev/XInputPad.hpp"
#ifndef WIN32_LEAN_AND_MEAN #ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN 1 #define WIN32_LEAN_AND_MEAN 1
#endif #endif

4
lib/inputdev/HIDParser.cpp
View File

@ -1,6 +1,8 @@
#include "boo/inputdev/HIDParser.hpp" #include "boo/inputdev/HIDParser.hpp"
#include <map>
#include <algorithm> #include <algorithm>
#include <map>
#include <type_traits>
#undef min #undef min
#undef max #undef max

5
lib/inputdev/IHIDDevice.hpp
View File

@ -1,9 +1,10 @@
#pragma once #pragma once
#include "boo/inputdev/DeviceToken.hpp"
#include "boo/inputdev/DeviceBase.hpp"
#include <memory> #include <memory>
#include "boo/inputdev/DeviceBase.hpp"
#include "boo/inputdev/DeviceToken.hpp"
#if _WIN32 #if _WIN32
#include <hidsdi.h> #include <hidsdi.h>
#endif #endif

2
lib/inputdev/IOKitPointer.hpp
View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "../CFPointer.hpp" #include "lib/CFPointer.hpp"
#include <IOKit/IOTypes.h> #include <IOKit/IOTypes.h>
#include <IOKit/IOKitLib.h> #include <IOKit/IOKitLib.h>
#include <IOKit/IOCFPlugIn.h> #include <IOKit/IOCFPlugIn.h>

5
lib/inputdev/NintendoPowerA.cpp
View File

@ -1,6 +1,9 @@
#include "boo/inputdev/NintendoPowerA.hpp" #include "boo/inputdev/NintendoPowerA.hpp"
#include <cstring>
#include "boo/inputdev/DeviceSignature.hpp" #include "boo/inputdev/DeviceSignature.hpp"
#include <memory.h>
namespace boo { namespace boo {
NintendoPowerA::NintendoPowerA(DeviceToken* token) NintendoPowerA::NintendoPowerA(DeviceToken* token)
: TDeviceBase<INintendoPowerACallback>(dev_typeid(NintendoPowerA), token) {} : TDeviceBase<INintendoPowerACallback>(dev_typeid(NintendoPowerA), token) {}

7
lib/mac/ApplicationCocoa.mm
View File

@ -1,12 +1,13 @@
#include <AppKit/AppKit.h> #include <AppKit/AppKit.h>
#include <thread> #include <thread>
#include "boo/IApplication.hpp" #include "boo/IApplication.hpp"
#include "boo/graphicsdev/Metal.hpp" #include "boo/graphicsdev/Metal.hpp"
#include "CocoaCommon.hpp" #include "lib/Common.hpp"
#include "../Common.hpp" #include "lib/mac/CocoaCommon.hpp"
#include "logvisor/logvisor.hpp" #include <logvisor/logvisor.hpp>
#if !__has_feature(objc_arc) #if !__has_feature(objc_arc)
#error ARC Required #error ARC Required

3
lib/mac/CocoaCommon.hpp
View File

@ -9,8 +9,9 @@
#include <Metal/Metal.h> #include <Metal/Metal.h>
#include <QuartzCore/CAMetalLayer.h> #include <QuartzCore/CAMetalLayer.h>
#include <unordered_map>
#include <mutex> #include <mutex>
#include <unordered_map>
namespace boo { namespace boo {
class IWindow; class IWindow;

2
lib/mac/WindowCocoa.mm
View File

@ -1,10 +1,10 @@
#include "boo/graphicsdev/Metal.hpp" #include "boo/graphicsdev/Metal.hpp"
#include "CocoaCommon.hpp"
#include "boo/IApplication.hpp" #include "boo/IApplication.hpp"
#include "boo/IGraphicsContext.hpp" #include "boo/IGraphicsContext.hpp"
#include "boo/IWindow.hpp" #include "boo/IWindow.hpp"
#include "boo/audiodev/IAudioVoiceEngine.hpp" #include "boo/audiodev/IAudioVoiceEngine.hpp"
#include "lib/mac/CocoaCommon.hpp"
#include <condition_variable> #include <condition_variable>
#include <memory> #include <memory>

3
lib/nx/WindowNX.cpp
View File

@ -1,8 +1,9 @@
#include "boo/IWindow.hpp" #include "boo/IWindow.hpp"
#include "boo/IGraphicsContext.hpp" #include "boo/IGraphicsContext.hpp"
#include "logvisor/logvisor.hpp"
#include "boo/graphicsdev/NX.hpp" #include "boo/graphicsdev/NX.hpp"
#include <logvisor/logvisor.hpp>
#include <switch.h> #include <switch.h>
namespace boo { namespace boo {

13
lib/win/ApplicationUWP.cpp
View File

@ -1,4 +1,4 @@
#include "UWPCommon.hpp" #include "lib/win/UWPCommon.hpp"
using namespace Windows::Foundation; using namespace Windows::Foundation;
using namespace Windows::UI::Core; using namespace Windows::UI::Core;
@ -12,12 +12,15 @@ using namespace Platform;
#define D3D11_CREATE_DEVICE_FLAGS 0 #define D3D11_CREATE_DEVICE_FLAGS 0
#endif #endif
#include "boo/System.hpp" #include <cstdlib>
#include "boo/IApplication.hpp" #include "boo/IApplication.hpp"
#include "boo/inputdev/DeviceFinder.hpp" #include "boo/System.hpp"
#include "boo/graphicsdev/D3D.hpp"
#include "logvisor/logvisor.hpp"
#include "boo/UWPViewProvider.hpp" #include "boo/UWPViewProvider.hpp"
#include "boo/graphicsdev/D3D.hpp"
#include "boo/inputdev/DeviceFinder.hpp"
#include <logvisor/logvisor.hpp>
#if _WIN32_WINNT_WIN10 #if _WIN32_WINNT_WIN10
PFN_D3D12_SERIALIZE_ROOT_SIGNATURE D3D12SerializeRootSignaturePROC = nullptr; PFN_D3D12_SERIALIZE_ROOT_SIGNATURE D3D12SerializeRootSignaturePROC = nullptr;

17
lib/win/ApplicationWin32.cpp
View File

@ -1,4 +1,5 @@
#include "Win32Common.hpp" #include "lib/win/Win32Common.hpp"
#include <shellapi.h> #include <shellapi.h>
#include <initguid.h> #include <initguid.h>
#include <Usbiodef.h> #include <Usbiodef.h>
@ -15,19 +16,21 @@ PFN_GetScaleFactorForMonitor MyGetScaleFactorForMonitor = nullptr;
#define D3D11_CREATE_DEVICE_FLAGS 0 #define D3D11_CREATE_DEVICE_FLAGS 0
#endif #endif
#include "boo/System.hpp" #include <condition_variable>
#include <cstdlib>
#include <mutex>
#include "boo/IApplication.hpp" #include "boo/IApplication.hpp"
#include "boo/inputdev/DeviceFinder.hpp" #include "boo/System.hpp"
#include "boo/graphicsdev/D3D.hpp" #include "boo/graphicsdev/D3D.hpp"
#include "logvisor/logvisor.hpp" #include "boo/inputdev/DeviceFinder.hpp"
#include <logvisor/logvisor.hpp>
#if BOO_HAS_VULKAN #if BOO_HAS_VULKAN
#include "boo/graphicsdev/Vulkan.hpp" #include "boo/graphicsdev/Vulkan.hpp"
#endif #endif
#include <condition_variable>
#include <mutex>
DWORD g_mainThreadId = 0; DWORD g_mainThreadId = 0;
std::mutex g_nwmt; std::mutex g_nwmt;
std::condition_variable g_nwcv; std::condition_variable g_nwcv;

2
lib/win/UWPCommon.hpp
View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "WinCommon.hpp" #include "lib/win/WinCommon.hpp"
struct Boo3DAppContextUWP : Boo3DAppContext { struct Boo3DAppContextUWP : Boo3DAppContext {
bool isFullscreen(const boo::IWindow* window) { bool isFullscreen(const boo::IWindow* window) {

4
lib/win/WinCommon.hpp
View File

@ -1,6 +1,10 @@
#pragma once #pragma once
#include <cstddef>
#include <cstdint>
#include <string>
#include <unordered_map> #include <unordered_map>
#include "boo/IWindow.hpp" #include "boo/IWindow.hpp"
namespace boo { namespace boo {

13
lib/win/WindowUWP.cpp
View File

@ -1,11 +1,12 @@
#include "UWPCommon.hpp" #include "lib/win/UWPCommon.hpp"
#include "boo/IApplication.hpp"
#include "boo/IWindow.hpp"
#include "boo/IGraphicsContext.hpp"
#include "logvisor/logvisor.hpp"
#include "boo/graphicsdev/D3D.hpp" #include "boo/IApplication.hpp"
#include "boo/IGraphicsContext.hpp"
#include "boo/IWindow.hpp"
#include "boo/audiodev/IAudioVoiceEngine.hpp" #include "boo/audiodev/IAudioVoiceEngine.hpp"
#include "boo/graphicsdev/D3D.hpp"
#include <logvisor/logvisor.hpp>
using namespace Windows::UI; using namespace Windows::UI;
using namespace Windows::UI::Core; using namespace Windows::UI::Core;

17
lib/win/WindowWin32.cpp
View File

@ -1,15 +1,16 @@
#include "Win32Common.hpp" #include "lib/win/Win32Common.hpp"
#include <Windowsx.h>
#include "boo/IApplication.hpp"
#include "boo/IWindow.hpp"
#include "boo/IGraphicsContext.hpp"
#include "logvisor/logvisor.hpp"
#include <Windowsx.h>
#include "boo/IApplication.hpp"
#include "boo/IGraphicsContext.hpp"
#include "boo/IWindow.hpp"
#include "boo/audiodev/IAudioVoiceEngine.hpp"
#include "boo/graphicsdev/D3D.hpp" #include "boo/graphicsdev/D3D.hpp"
#include "boo/graphicsdev/GL.hpp" #include "boo/graphicsdev/GL.hpp"
#include "boo/graphicsdev/glew.h" #include "boo/graphicsdev/glew.h"
#include "boo/graphicsdev/wglew.h" #include "boo/graphicsdev/wglew.h"
#include "boo/audiodev/IAudioVoiceEngine.hpp"
#if BOO_HAS_VULKAN #if BOO_HAS_VULKAN
#include "boo/graphicsdev/Vulkan.hpp" #include "boo/graphicsdev/Vulkan.hpp"
@ -19,6 +20,8 @@
#include <dxgi1_5.h> #include <dxgi1_5.h>
#endif #endif
#include <logvisor/logvisor.hpp>
static const int ContextAttribs[] = {WGL_CONTEXT_MAJOR_VERSION_ARB, 3, WGL_CONTEXT_MINOR_VERSION_ARB, 3, static const int ContextAttribs[] = {WGL_CONTEXT_MAJOR_VERSION_ARB, 3, WGL_CONTEXT_MINOR_VERSION_ARB, 3,
WGL_CONTEXT_PROFILE_MASK_ARB, WGL_CONTEXT_CORE_PROFILE_BIT_ARB, WGL_CONTEXT_PROFILE_MASK_ARB, WGL_CONTEXT_CORE_PROFILE_BIT_ARB,
// WGL_CONTEXT_FLAGS_ARB, WGL_CONTEXT_DEBUG_BIT_ARB, // WGL_CONTEXT_FLAGS_ARB, WGL_CONTEXT_DEBUG_BIT_ARB,

9
lib/x11/ApplicationUnix.cpp
View File

@ -4,12 +4,15 @@
#define APPLICATION_UNIX_CPP #define APPLICATION_UNIX_CPP
#include <dbus/dbus.h>
#include <cstdint> #include <cstdint>
#include <unistd.h> #include <cstdlib>
#include "logvisor/logvisor.hpp"
#include "boo/IApplication.hpp" #include "boo/IApplication.hpp"
#include <dbus/dbus.h>
#include <logvisor/logvisor.hpp>
#include <unistd.h>
namespace boo { namespace boo {
static logvisor::Module Log("boo::ApplicationUnix"); static logvisor::Module Log("boo::ApplicationUnix");
IApplication* APP = nullptr; IApplication* APP = nullptr;

3
lib/x11/ApplicationXlib.hpp
View File

@ -4,7 +4,7 @@
#include "boo/IApplication.hpp" #include "boo/IApplication.hpp"
#include "boo/graphicsdev/GL.hpp" #include "boo/graphicsdev/GL.hpp"
#include "../Common.hpp" #include "lib/Common.hpp"
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/XKBlib.h> #include <X11/XKBlib.h>
@ -16,6 +16,7 @@
#include <dbus/dbus.h> #include <dbus/dbus.h>
DBusConnection* RegisterDBus(const char* appName, bool& isFirst); DBusConnection* RegisterDBus(const char* appName, bool& isFirst);
#include <clocale>
#include <condition_variable> #include <condition_variable>
#include <csignal> #include <csignal>
#include <locale> #include <locale>

1
lib/x11/WindowWayland.cpp
View File

@ -1,4 +1,5 @@
#include "boo/IWindow.hpp" #include "boo/IWindow.hpp"
#include "boo/IGraphicsContext.hpp" #include "boo/IGraphicsContext.hpp"
#include "boo/audiodev/IAudioVoiceEngine.hpp" #include "boo/audiodev/IAudioVoiceEngine.hpp"

9
lib/x11/WindowXlib.cpp
View File

@ -1,10 +1,11 @@
#include "boo/IWindow.hpp" #include "boo/IWindow.hpp"
#include "boo/IGraphicsContext.hpp"
#include "boo/IApplication.hpp" #include "boo/IApplication.hpp"
#include "boo/graphicsdev/GL.hpp" #include "boo/IGraphicsContext.hpp"
#include "boo/audiodev/IAudioVoiceEngine.hpp" #include "boo/audiodev/IAudioVoiceEngine.hpp"
#include "boo/graphicsdev/GL.hpp"
#include "boo/graphicsdev/glew.h" #include "boo/graphicsdev/glew.h"
#include "../Common.hpp" #include "lib/Common.hpp"
#if BOO_HAS_VULKAN #if BOO_HAS_VULKAN
#include "boo/graphicsdev/Vulkan.hpp" #include "boo/graphicsdev/Vulkan.hpp"
@ -35,7 +36,7 @@
#include <X11/extensions/Xrandr.h> #include <X11/extensions/Xrandr.h>
#include <logvisor/logvisor.hpp> #include <logvisor/logvisor.hpp>
#include "XlibCommon.hpp" #include "lib/x11/XlibCommon.hpp"
#define REF_DPMM 3.78138 #define REF_DPMM 3.78138
#define FS_ATOM "_NET_WM_STATE_FULLSCREEN" #define FS_ATOM "_NET_WM_STATE_FULLSCREEN"

15
test/main.cpp
View File

@ -1,14 +1,15 @@
#include <cstdio>
#include <cmath>
#include <boo/boo.hpp> #include <boo/boo.hpp>
#include <boo/graphicsdev/GL.hpp>
#include <boo/graphicsdev/Vulkan.hpp>
#include <boo/graphicsdev/D3D.hpp> #include <boo/graphicsdev/D3D.hpp>
#include <boo/graphicsdev/GL.hpp>
#include <boo/graphicsdev/GLSLMacros.hpp>
#include <boo/graphicsdev/Metal.hpp> #include <boo/graphicsdev/Metal.hpp>
#include <thread> #include <boo/graphicsdev/Vulkan.hpp>
#include <mutex>
#include <condition_variable> #include <condition_variable>
#include "logvisor/logvisor.hpp" #include <cstdio>
#include <thread>
#include <logvisor/logvisor.hpp>
namespace boo { namespace boo {