From 51101b17d4c7bb29ff134fca675e3172db1df38e Mon Sep 17 00:00:00 2001 From: "Daniel K. O. (dkosmari)" Date: Mon, 1 Jun 2026 16:54:49 -0300 Subject: [PATCH 1/2] Add convenience headers to include all of GX2 and GX2R. --- include/gx2/all.h | 28 +++++++++++++++++++ include/gx2r/all.h | 13 +++++++++ .../test_compile_headers_list.h | 2 ++ 3 files changed, 43 insertions(+) create mode 100644 include/gx2/all.h create mode 100644 include/gx2r/all.h diff --git a/include/gx2/all.h b/include/gx2/all.h new file mode 100644 index 000000000..f99cb32aa --- /dev/null +++ b/include/gx2/all.h @@ -0,0 +1,28 @@ +#pragma once + +/** + * \ingroup gx2 + * This is a convenience header to include all gx2 headers at once. + */ + +#include "aperture.h" +#include "clear.h" +#include "context.h" +#include "debug.h" +#include "display.h" +#include "displaylist.h" +#include "draw.h" +#include "enum.h" +#include "event.h" +#include "mem.h" +#include "registers.h" +#include "sampler.h" +#include "semaphore.h" +#include "shaders.h" +#include "state.h" +#include "surface.h" +#include "swap.h" +#include "temp.h" +#include "tessellation.h" +#include "texture.h" +#include "utils.h" diff --git a/include/gx2r/all.h b/include/gx2r/all.h new file mode 100644 index 000000000..913c975a3 --- /dev/null +++ b/include/gx2r/all.h @@ -0,0 +1,13 @@ +#pragma once + +/** + * \ingroup gx2r + * This is a convenience header to include all gx2r headers at once. + */ + +#include "buffer.h" +#include "displaylist.h" +#include "draw.h" +#include "mem.h" +#include "resource.h" +#include "surface.h" diff --git a/tests/test_compile_headers_common/test_compile_headers_list.h b/tests/test_compile_headers_common/test_compile_headers_list.h index 25da7d9f3..379228c19 100644 --- a/tests/test_compile_headers_common/test_compile_headers_list.h +++ b/tests/test_compile_headers_common/test_compile_headers_list.h @@ -69,6 +69,7 @@ #include #include #include +#include #include #include #include @@ -89,6 +90,7 @@ #include #include #include +#include #include #include #include From 809d0623f18b149f61c694b303429bd7883c76eb Mon Sep 17 00:00:00 2001 From: "Daniel K. O. (dkosmari)" Date: Mon, 1 Jun 2026 17:14:12 -0300 Subject: [PATCH 2/2] Prefer top-level headers. --- include/gx2.h | 28 +++++++++++++++++++ include/gx2/all.h | 28 ------------------- include/gx2r.h | 13 +++++++++ include/gx2r/all.h | 13 --------- .../test_compile_headers_list.h | 4 +-- 5 files changed, 43 insertions(+), 43 deletions(-) create mode 100644 include/gx2.h delete mode 100644 include/gx2/all.h create mode 100644 include/gx2r.h delete mode 100644 include/gx2r/all.h diff --git a/include/gx2.h b/include/gx2.h new file mode 100644 index 000000000..ba4b4f19a --- /dev/null +++ b/include/gx2.h @@ -0,0 +1,28 @@ +#pragma once + +/** + * \ingroup gx2 + * This is a convenience header to include all gx2 headers at once. + */ + +#include "gx2/aperture.h" +#include "gx2/clear.h" +#include "gx2/context.h" +#include "gx2/debug.h" +#include "gx2/display.h" +#include "gx2/displaylist.h" +#include "gx2/draw.h" +#include "gx2/enum.h" +#include "gx2/event.h" +#include "gx2/mem.h" +#include "gx2/registers.h" +#include "gx2/sampler.h" +#include "gx2/semaphore.h" +#include "gx2/shaders.h" +#include "gx2/state.h" +#include "gx2/surface.h" +#include "gx2/swap.h" +#include "gx2/temp.h" +#include "gx2/tessellation.h" +#include "gx2/texture.h" +#include "gx2/utils.h" diff --git a/include/gx2/all.h b/include/gx2/all.h deleted file mode 100644 index f99cb32aa..000000000 --- a/include/gx2/all.h +++ /dev/null @@ -1,28 +0,0 @@ -#pragma once - -/** - * \ingroup gx2 - * This is a convenience header to include all gx2 headers at once. - */ - -#include "aperture.h" -#include "clear.h" -#include "context.h" -#include "debug.h" -#include "display.h" -#include "displaylist.h" -#include "draw.h" -#include "enum.h" -#include "event.h" -#include "mem.h" -#include "registers.h" -#include "sampler.h" -#include "semaphore.h" -#include "shaders.h" -#include "state.h" -#include "surface.h" -#include "swap.h" -#include "temp.h" -#include "tessellation.h" -#include "texture.h" -#include "utils.h" diff --git a/include/gx2r.h b/include/gx2r.h new file mode 100644 index 000000000..aed4a185f --- /dev/null +++ b/include/gx2r.h @@ -0,0 +1,13 @@ +#pragma once + +/** + * \ingroup gx2r + * This is a convenience header to include all gx2r headers at once. + */ + +#include "gx2r/buffer.h" +#include "gx2r/displaylist.h" +#include "gx2r/draw.h" +#include "gx2r/mem.h" +#include "gx2r/resource.h" +#include "gx2r/surface.h" diff --git a/include/gx2r/all.h b/include/gx2r/all.h deleted file mode 100644 index 913c975a3..000000000 --- a/include/gx2r/all.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -/** - * \ingroup gx2r - * This is a convenience header to include all gx2r headers at once. - */ - -#include "buffer.h" -#include "displaylist.h" -#include "draw.h" -#include "mem.h" -#include "resource.h" -#include "surface.h" diff --git a/tests/test_compile_headers_common/test_compile_headers_list.h b/tests/test_compile_headers_common/test_compile_headers_list.h index 379228c19..78ba559ea 100644 --- a/tests/test_compile_headers_common/test_compile_headers_list.h +++ b/tests/test_compile_headers_common/test_compile_headers_list.h @@ -69,7 +69,7 @@ #include #include #include -#include +#include #include #include #include @@ -90,7 +90,7 @@ #include #include #include -#include +#include #include #include #include