Same change to drivers.

This commit is contained in:
Relintai 2022-03-17 22:18:15 +01:00
parent 340cc8ba45
commit ce328027fa
34 changed files with 136 additions and 68 deletions

View File

@ -1,3 +1,5 @@
#ifndef AUDIO_DRIVER_ALSA_H
#define AUDIO_DRIVER_ALSA_H
/*************************************************************************/
/* audio_driver_alsa.h */
/*************************************************************************/
@ -28,8 +30,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef AUDIO_DRIVER_ALSA_H
#define AUDIO_DRIVER_ALSA_H
#ifdef ALSA_ENABLED

View File

@ -1,3 +1,5 @@
#ifndef MIDI_DRIVER_ALSAMIDI_H
#define MIDI_DRIVER_ALSAMIDI_H
/*************************************************************************/
/* midi_driver_alsamidi.h */
/*************************************************************************/
@ -28,8 +30,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef MIDI_DRIVER_ALSAMIDI_H
#define MIDI_DRIVER_ALSAMIDI_H
#ifdef ALSAMIDI_ENABLED

View File

@ -1,3 +1,5 @@
#ifndef AUDIO_DRIVER_COREAUDIO_H
#define AUDIO_DRIVER_COREAUDIO_H
/*************************************************************************/
/* audio_driver_coreaudio.h */
/*************************************************************************/
@ -30,8 +32,8 @@
#ifdef COREAUDIO_ENABLED
#ifndef AUDIO_DRIVER_COREAUDIO_H
#define AUDIO_DRIVER_COREAUDIO_H
#include "servers/audio_server.h"

View File

@ -1,3 +1,5 @@
#ifndef MIDI_DRIVER_COREMIDI_H
#define MIDI_DRIVER_COREMIDI_H
/*************************************************************************/
/* midi_driver_coremidi.h */
/*************************************************************************/
@ -30,8 +32,8 @@
#ifdef COREMIDI_ENABLED
#ifndef MIDI_DRIVER_COREMIDI_H
#define MIDI_DRIVER_COREMIDI_H
#include "core/os/midi_driver.h"
#include "core/vector.h"

View File

@ -1,3 +1,5 @@
#ifndef RASTERIZER_DUMMY_H
#define RASTERIZER_DUMMY_H
/*************************************************************************/
/* rasterizer_dummy.h */
/*************************************************************************/
@ -28,8 +30,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef RASTERIZER_DUMMY_H
#define RASTERIZER_DUMMY_H
#include "core/math/camera_matrix.h"
#include "core/self_list.h"

View File

@ -1,3 +1,5 @@
#ifndef TEXTURE_LOADER_DUMMY_H
#define TEXTURE_LOADER_DUMMY_H
/*************************************************************************/
/* texture_loader_dummy.h */
/*************************************************************************/
@ -28,8 +30,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef TEXTURE_LOADER_DUMMY_H
#define TEXTURE_LOADER_DUMMY_H
#include "core/io/resource_loader.h"
#include "scene/resources/texture.h"

View File

@ -1,3 +1,5 @@
#ifndef RASTERIZERCANVASBASEGLES2_H
#define RASTERIZERCANVASBASEGLES2_H
/*************************************************************************/
/* rasterizer_canvas_base_gles2.h */
/*************************************************************************/
@ -28,8 +30,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef RASTERIZERCANVASBASEGLES2_H
#define RASTERIZERCANVASBASEGLES2_H
#include "drivers/gles_common/rasterizer_array.h"
#include "rasterizer_storage_gles2.h"

View File

@ -1,3 +1,5 @@
#ifndef RASTERIZERCANVASGLES2_H
#define RASTERIZERCANVASGLES2_H
/*************************************************************************/
/* rasterizer_canvas_gles2.h */
/*************************************************************************/
@ -28,8 +30,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef RASTERIZERCANVASGLES2_H
#define RASTERIZERCANVASGLES2_H
#include "drivers/gles_common/rasterizer_canvas_batcher.h"
#include "rasterizer_canvas_base_gles2.h"

View File

@ -1,3 +1,5 @@
#ifndef RASTERIZERGLES2_H
#define RASTERIZERGLES2_H
/*************************************************************************/
/* rasterizer_gles2.h */
/*************************************************************************/
@ -28,8 +30,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef RASTERIZERGLES2_H
#define RASTERIZERGLES2_H
#include "rasterizer_canvas_gles2.h"
#include "rasterizer_scene_gles2.h"

View File

@ -1,3 +1,5 @@
#ifndef RASTERIZERSCENEGLES2_H
#define RASTERIZERSCENEGLES2_H
/*************************************************************************/
/* rasterizer_scene_gles2.h */
/*************************************************************************/
@ -28,8 +30,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef RASTERIZERSCENEGLES2_H
#define RASTERIZERSCENEGLES2_H
/* Must come before shaders or the Windows build fails... */
#include "rasterizer_storage_gles2.h"

View File

@ -1,3 +1,5 @@
#ifndef RASTERIZERSTORAGEGLES2_H
#define RASTERIZERSTORAGEGLES2_H
/*************************************************************************/
/* rasterizer_storage_gles2.h */
/*************************************************************************/
@ -28,8 +30,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef RASTERIZERSTORAGEGLES2_H
#define RASTERIZERSTORAGEGLES2_H
#include "core/pool_vector.h"
#include "core/self_list.h"

View File

@ -1,3 +1,5 @@
#ifndef SHADERCOMPILERGLES2_H
#define SHADERCOMPILERGLES2_H
/*************************************************************************/
/* shader_compiler_gles2.h */
/*************************************************************************/
@ -28,8 +30,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef SHADERCOMPILERGLES2_H
#define SHADERCOMPILERGLES2_H
#include "core/pair.h"
#include "core/string_builder.h"

View File

@ -1,3 +1,5 @@
#ifndef SHADER_GLES2_H
#define SHADER_GLES2_H
/*************************************************************************/
/* shader_gles2.h */
/*************************************************************************/
@ -28,8 +30,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef SHADER_GLES2_H
#define SHADER_GLES2_H
// This must come first to avoid windows.h mess
#include "platform_config.h"

View File

@ -1,3 +1,5 @@
#ifndef RASTERIZER_ARRAY_H
#define RASTERIZER_ARRAY_H
/*************************************************************************/
/* rasterizer_array.h */
/*************************************************************************/
@ -28,8 +30,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef RASTERIZER_ARRAY_H
#define RASTERIZER_ARRAY_H
/**
* Fast single-threaded growable array for POD types.

View File

@ -1,3 +1,5 @@
#ifndef RASTERIZER_ASSERTS_H
#define RASTERIZER_ASSERTS_H
/*************************************************************************/
/* rasterizer_asserts.h */
/*************************************************************************/
@ -28,8 +30,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef RASTERIZER_ASSERTS_H
#define RASTERIZER_ASSERTS_H
// For flow control checking, we want an easy way to apply asserts that occur in debug development builds only.
// This is enforced by outputting a warning which will fail CI checks if the define is set in a PR.

View File

@ -1,3 +1,5 @@
#ifndef RASTERIZER_CANVAS_BATCHER_H
#define RASTERIZER_CANVAS_BATCHER_H
/*************************************************************************/
/* rasterizer_canvas_batcher.h */
/*************************************************************************/
@ -28,8 +30,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef RASTERIZER_CANVAS_BATCHER_H
#define RASTERIZER_CANVAS_BATCHER_H
#include "core/os/os.h"
#include "core/project_settings.h"

View File

@ -1,3 +1,5 @@
#ifndef RASTERIZER_STORAGE_COMMON_H
#define RASTERIZER_STORAGE_COMMON_H
/*************************************************************************/
/* rasterizer_storage_common.h */
/*************************************************************************/
@ -28,8 +30,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef RASTERIZER_STORAGE_COMMON_H
#define RASTERIZER_STORAGE_COMMON_H
class RasterizerStorageCommon {
public:

View File

@ -1,3 +1,5 @@
#ifndef IMAGE_LOADER_PNG_H
#define IMAGE_LOADER_PNG_H
/*************************************************************************/
/* image_loader_png.h */
/*************************************************************************/
@ -28,8 +30,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef IMAGE_LOADER_PNG_H
#define IMAGE_LOADER_PNG_H
#include "core/io/image_loader.h"

View File

@ -1,3 +1,5 @@
#ifndef PNG_DRIVER_COMMON_H
#define PNG_DRIVER_COMMON_H
/*************************************************************************/
/* png_driver_common.h */
/*************************************************************************/
@ -28,8 +30,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef PNG_DRIVER_COMMON_H
#define PNG_DRIVER_COMMON_H
#include "core/image.h"
#include "core/pool_vector.h"

View File

@ -1,3 +1,5 @@
#ifndef RESOURCE_SAVER_PNG_H
#define RESOURCE_SAVER_PNG_H
/*************************************************************************/
/* resource_saver_png.h */
/*************************************************************************/
@ -28,8 +30,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef RESOURCE_SAVER_PNG_H
#define RESOURCE_SAVER_PNG_H
#include "core/image.h"
#include "core/io/resource_saver.h"

View File

@ -1,3 +1,5 @@
#ifndef AUDIO_DRIVER_PULSEAUDIO_H
#define AUDIO_DRIVER_PULSEAUDIO_H
/*************************************************************************/
/* audio_driver_pulseaudio.h */
/*************************************************************************/
@ -28,8 +30,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef AUDIO_DRIVER_PULSEAUDIO_H
#define AUDIO_DRIVER_PULSEAUDIO_H
#ifdef PULSEAUDIO_ENABLED

View File

@ -1,3 +1,5 @@
#ifndef REGISTER_DRIVER_TYPES_H
#define REGISTER_DRIVER_TYPES_H
/*************************************************************************/
/* register_driver_types.h */
/*************************************************************************/
@ -28,8 +30,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef REGISTER_DRIVER_TYPES_H
#define REGISTER_DRIVER_TYPES_H
void register_core_driver_types();
void unregister_core_driver_types();

View File

@ -1,3 +1,5 @@
#ifndef DIR_ACCESS_UNIX_H
#define DIR_ACCESS_UNIX_H
/*************************************************************************/
/* dir_access_unix.h */
/*************************************************************************/
@ -28,8 +30,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef DIR_ACCESS_UNIX_H
#define DIR_ACCESS_UNIX_H
#if defined(UNIX_ENABLED) || defined(LIBC_FILEIO_ENABLED)

View File

@ -1,3 +1,5 @@
#ifndef FILE_ACCESS_UNIX_H
#define FILE_ACCESS_UNIX_H
/*************************************************************************/
/* file_access_unix.h */
/*************************************************************************/
@ -28,8 +30,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef FILE_ACCESS_UNIX_H
#define FILE_ACCESS_UNIX_H
#include "core/os/file_access.h"
#include "core/os/memory.h"

View File

@ -1,3 +1,5 @@
#ifndef IP_UNIX_H
#define IP_UNIX_H
/*************************************************************************/
/* ip_unix.h */
/*************************************************************************/
@ -28,8 +30,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef IP_UNIX_H
#define IP_UNIX_H
#include "core/io/ip.h"

View File

@ -1,3 +1,5 @@
#ifndef NET_SOCKET_UNIX_H
#define NET_SOCKET_UNIX_H
/*************************************************************************/
/* net_socket_posix.h */
/*************************************************************************/
@ -28,8 +30,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef NET_SOCKET_UNIX_H
#define NET_SOCKET_UNIX_H
#include "core/io/net_socket.h"

View File

@ -1,3 +1,5 @@
#ifndef OS_UNIX_H
#define OS_UNIX_H
/*************************************************************************/
/* os_unix.h */
/*************************************************************************/
@ -28,8 +30,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef OS_UNIX_H
#define OS_UNIX_H
#ifdef UNIX_ENABLED

View File

@ -1,3 +1,5 @@
#ifndef SYSLOG_LOGGER_H
#define SYSLOG_LOGGER_H
/*************************************************************************/
/* syslog_logger.h */
/*************************************************************************/
@ -28,8 +30,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef SYSLOG_LOGGER_H
#define SYSLOG_LOGGER_H
#ifdef UNIX_ENABLED

View File

@ -1,3 +1,5 @@
#ifndef THREAD_POSIX_H
#define THREAD_POSIX_H
/*************************************************************************/
/* thread_posix.h */
/*************************************************************************/
@ -28,8 +30,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef THREAD_POSIX_H
#define THREAD_POSIX_H
#if !defined(NO_THREADS)
void init_thread_posix();

View File

@ -1,3 +1,5 @@
#ifndef AUDIO_DRIVER_WASAPI_H
#define AUDIO_DRIVER_WASAPI_H
/*************************************************************************/
/* audio_driver_wasapi.h */
/*************************************************************************/
@ -28,8 +30,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef AUDIO_DRIVER_WASAPI_H
#define AUDIO_DRIVER_WASAPI_H
#ifdef WASAPI_ENABLED

View File

@ -1,3 +1,5 @@
#ifndef DIR_ACCESS_WINDOWS_H
#define DIR_ACCESS_WINDOWS_H
/*************************************************************************/
/* dir_access_windows.h */
/*************************************************************************/
@ -28,8 +30,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef DIR_ACCESS_WINDOWS_H
#define DIR_ACCESS_WINDOWS_H
#ifdef WINDOWS_ENABLED

View File

@ -1,3 +1,5 @@
#ifndef FILE_ACCESS_WINDOWS_H
#define FILE_ACCESS_WINDOWS_H
/*************************************************************************/
/* file_access_windows.h */
/*************************************************************************/
@ -28,8 +30,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef FILE_ACCESS_WINDOWS_H
#define FILE_ACCESS_WINDOWS_H
#ifdef WINDOWS_ENABLED

View File

@ -1,3 +1,5 @@
#ifndef MIDI_DRIVER_WINMIDI_H
#define MIDI_DRIVER_WINMIDI_H
/*************************************************************************/
/* midi_driver_winmidi.h */
/*************************************************************************/
@ -30,8 +32,8 @@
#ifdef WINMIDI_ENABLED
#ifndef MIDI_DRIVER_WINMIDI_H
#define MIDI_DRIVER_WINMIDI_H
#include "core/os/midi_driver.h"
#include "core/vector.h"

View File

@ -1,3 +1,5 @@
#ifndef AUDIO_DRIVER_XAUDIO2_H
#define AUDIO_DRIVER_XAUDIO2_H
/*************************************************************************/
/* audio_driver_xaudio2.h */
/*************************************************************************/
@ -28,8 +30,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef AUDIO_DRIVER_XAUDIO2_H
#define AUDIO_DRIVER_XAUDIO2_H
#include "core/os/mutex.h"
#include "core/os/thread.h"