From b8d88113c2d23302e8f9e533db12618ea82884d6 Mon Sep 17 00:00:00 2001 From: Jakob Bornecrantz Date: Sun, 20 Jun 2021 14:53:40 +0100 Subject: [PATCH] st/oxr: Add gfx to session gfx files --- doc/changes/state_trackers/mr.847.1.md | 1 + src/xrt/state_trackers/oxr/CMakeLists.txt | 10 ++++++---- src/xrt/state_trackers/oxr/meson.build | 6 +++--- .../oxr/{oxr_session_egl.c => oxr_session_gfx_egl.c} | 0 .../oxr/{oxr_session_gl.c => oxr_session_gfx_gl.c} | 0 ...n_gles_android.c => oxr_session_gfx_gles_android.c} | 0 .../oxr/{oxr_session_vk.c => oxr_session_gfx_vk.c} | 0 7 files changed, 10 insertions(+), 7 deletions(-) create mode 100644 doc/changes/state_trackers/mr.847.1.md rename src/xrt/state_trackers/oxr/{oxr_session_egl.c => oxr_session_gfx_egl.c} (100%) rename src/xrt/state_trackers/oxr/{oxr_session_gl.c => oxr_session_gfx_gl.c} (100%) rename src/xrt/state_trackers/oxr/{oxr_session_gles_android.c => oxr_session_gfx_gles_android.c} (100%) rename src/xrt/state_trackers/oxr/{oxr_session_vk.c => oxr_session_gfx_vk.c} (100%) diff --git a/doc/changes/state_trackers/mr.847.1.md b/doc/changes/state_trackers/mr.847.1.md new file mode 100644 index 000000000..3be52e3ee --- /dev/null +++ b/doc/changes/state_trackers/mr.847.1.md @@ -0,0 +1 @@ +OpenXR: Add prefix to gfx related session functions to improve sorting. diff --git a/src/xrt/state_trackers/oxr/CMakeLists.txt b/src/xrt/state_trackers/oxr/CMakeLists.txt index 6e20ba11c..9fdcd83c8 100644 --- a/src/xrt/state_trackers/oxr/CMakeLists.txt +++ b/src/xrt/state_trackers/oxr/CMakeLists.txt @@ -39,7 +39,7 @@ set(OXR_SOURCE_FILES if(XRT_HAVE_VULKAN) list(APPEND OXR_SOURCE_FILES - oxr_session_vk.c + oxr_session_gfx_vk.c oxr_swapchain_vk.c oxr_vulkan.c ) @@ -54,7 +54,7 @@ endif() if(XRT_HAVE_OPENGL OR XRT_HAVE_OPENGLES) list(APPEND OXR_SOURCE_FILES - oxr_session_gl.c + oxr_session_gfx_gl.c oxr_swapchain_gl.c ) endif() @@ -65,14 +65,16 @@ endif() if(XRT_HAVE_EGL) add_definitions(-DXR_USE_PLATFORM_EGL) - list(APPEND OXR_SOURCE_FILES oxr_session_egl.c) + list(APPEND OXR_SOURCE_FILES + oxr_session_gfx_egl.c + ) endif() if(ANDROID) add_definitions(-DXR_USE_PLATFORM_ANDROID) list(APPEND OXR_SOURCE_FILES - oxr_session_gles_android.c + oxr_session_gfx_gles_android.c ) endif() diff --git a/src/xrt/state_trackers/oxr/meson.build b/src/xrt/state_trackers/oxr/meson.build index 3e267c343..ba891ce2e 100644 --- a/src/xrt/state_trackers/oxr/meson.build +++ b/src/xrt/state_trackers/oxr/meson.build @@ -48,9 +48,9 @@ lib_st_oxr = static_library( 'oxr_objects.h', 'oxr_path.c', 'oxr_session.c', - 'oxr_session_gl.c', - 'oxr_session_egl.c', - 'oxr_session_vk.c', + 'oxr_session_gfx_gl.c', + 'oxr_session_gfx_egl.c', + 'oxr_session_gfx_vk.c', 'oxr_space.c', 'oxr_swapchain.c', 'oxr_swapchain_gl.c', diff --git a/src/xrt/state_trackers/oxr/oxr_session_egl.c b/src/xrt/state_trackers/oxr/oxr_session_gfx_egl.c similarity index 100% rename from src/xrt/state_trackers/oxr/oxr_session_egl.c rename to src/xrt/state_trackers/oxr/oxr_session_gfx_egl.c diff --git a/src/xrt/state_trackers/oxr/oxr_session_gl.c b/src/xrt/state_trackers/oxr/oxr_session_gfx_gl.c similarity index 100% rename from src/xrt/state_trackers/oxr/oxr_session_gl.c rename to src/xrt/state_trackers/oxr/oxr_session_gfx_gl.c diff --git a/src/xrt/state_trackers/oxr/oxr_session_gles_android.c b/src/xrt/state_trackers/oxr/oxr_session_gfx_gles_android.c similarity index 100% rename from src/xrt/state_trackers/oxr/oxr_session_gles_android.c rename to src/xrt/state_trackers/oxr/oxr_session_gfx_gles_android.c diff --git a/src/xrt/state_trackers/oxr/oxr_session_vk.c b/src/xrt/state_trackers/oxr/oxr_session_gfx_vk.c similarity index 100% rename from src/xrt/state_trackers/oxr/oxr_session_vk.c rename to src/xrt/state_trackers/oxr/oxr_session_gfx_vk.c