diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-06-13 16:56:21 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-06-15 14:35:45 +0200 |
| commit | 25b2f1780a9c7d7ae5579cc87c89b0c7e2baa14d (patch) | |
| tree | 40d2d50d34c175da3b7c5123e8918cc5816bd32b /modules/openxr/extensions/openxr_opengl_extension.h | |
| parent | 773414606079fa745d1c37fce49324ab6a09e972 (diff) | |
| download | redot-engine-25b2f1780a9c7d7ae5579cc87c89b0c7e2baa14d.tar.gz | |
Style: Harmonize header includes in modules
This applies our existing style guide, and adds a new rule to that style
guide for modular components such as platform ports and modules:
Includes from the platform port or module ("local" includes) should be listed
first in their own block using relative paths, before Godot's "core" includes
which use "absolute" (project folder relative) paths, and finally thirdparty
includes.
Includes in `#ifdef`s come after their relevant section, i.e. the overall
structure is:
- Local includes
* Conditional local includes
- Core includes
* Conditional core includes
- Thirdparty includes
* Conditional thirdparty includes
Diffstat (limited to 'modules/openxr/extensions/openxr_opengl_extension.h')
| -rw-r--r-- | modules/openxr/extensions/openxr_opengl_extension.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/modules/openxr/extensions/openxr_opengl_extension.h b/modules/openxr/extensions/openxr_opengl_extension.h index 29a9f35c51..598d3415ad 100644 --- a/modules/openxr/extensions/openxr_opengl_extension.h +++ b/modules/openxr/extensions/openxr_opengl_extension.h @@ -33,11 +33,11 @@ #ifdef GLES3_ENABLED -#include "core/templates/vector.h" -#include "openxr_extension_wrapper.h" - #include "../openxr_api.h" #include "../util.h" +#include "openxr_extension_wrapper.h" + +#include "core/templates/vector.h" #ifdef ANDROID_ENABLED #define XR_USE_GRAPHICS_API_OPENGL_ES @@ -61,6 +61,7 @@ #define GL3_PROTOTYPES 1 #include "thirdparty/glad/glad/gl.h" #include "thirdparty/glad/glad/glx.h" + #include <X11/Xlib.h> #endif @@ -69,7 +70,7 @@ #include <jni.h> #endif -// include platform dependent structs +// Include platform dependent structs. #include <openxr/openxr_platform.h> class OpenXROpenGLExtension : public OpenXRGraphicsExtensionWrapper { |