mirror of
https://gitlab.freedesktop.org/monado/monado.git
synced 2025-03-03 21:26:36 +00:00
st/oxr: Add super hacky debug gui
This commit is contained in:
Jakob Bornecrantz
parent
5f1078675d
commit
e56271d968
src/xrt
|
|
@ -30,6 +30,17 @@ DEBUG_GET_ONCE_FLOAT_OPTION(lfov_right, "OXR_OVERRIDE_LFOV_RIGHT", 0.0f)
|
|||
DEBUG_GET_ONCE_FLOAT_OPTION(lfov_up, "OXR_OVERRIDE_LFOV_UP", 0.0f)
|
||||
DEBUG_GET_ONCE_FLOAT_OPTION(lfov_down, "OXR_OVERRIDE_LFOV_DOWN", 0.0f)
|
||||
|
||||
/* ---- HACK ---- */
|
||||
extern int
|
||||
oxr_sdl2_hack_create(void **out_hack);
|
||||
|
||||
extern void
|
||||
oxr_sdl2_hack_start(void *hack, struct xrt_prober *xp);
|
||||
|
||||
extern void
|
||||
oxr_sdl2_hack_stop(void *hack);
|
||||
/* ---- HACK ---- */
|
||||
|
||||
static inline int32_t
|
||||
radtodeg_for_display(float radians)
|
||||
{
|
||||
|
|
@ -54,6 +65,10 @@ oxr_instance_destroy(struct oxr_logger *log, struct oxr_handle_base *hb)
|
|||
oxr_xdev_destroy(&inst->system.xdevs[i]);
|
||||
}
|
||||
|
||||
/* ---- HACK ---- */
|
||||
oxr_sdl2_hack_stop(inst->hack);
|
||||
/* ---- HACK ---- */
|
||||
|
||||
xrt_prober_destroy(&inst->prober);
|
||||
|
||||
time_state_destroy(inst->timekeeping);
|
||||
|
|
@ -87,6 +102,10 @@ oxr_instance_create(struct oxr_logger *log,
|
|||
OXR_ALLOCATE_HANDLE_OR_RETURN(log, inst, OXR_XR_DEBUG_INSTANCE,
|
||||
oxr_instance_destroy, NULL);
|
||||
|
||||
/* ---- HACK ---- */
|
||||
oxr_sdl2_hack_create(&inst->hack);
|
||||
/* ---- HACK ---- */
|
||||
|
||||
h_ret = u_hashset_create(&inst->path_store);
|
||||
if (h_ret != 0) {
|
||||
free(inst);
|
||||
|
|
@ -199,6 +218,10 @@ oxr_instance_create(struct oxr_logger *log,
|
|||
|
||||
u_var_add_root((void *)inst, "XrInstance", true);
|
||||
|
||||
/* ---- HACK ---- */
|
||||
oxr_sdl2_hack_start(inst->hack, inst->prober);
|
||||
/* ---- HACK ---- */
|
||||
|
||||
*out_instance = inst;
|
||||
|
||||
return XR_SUCCESS;
|
||||
|
|
|
|||
|
|
@ -859,6 +859,10 @@ struct oxr_instance
|
|||
//! Common structure for things referred to by OpenXR handles.
|
||||
struct oxr_handle_base handle;
|
||||
|
||||
/* ---- HACK ---- */
|
||||
void *hack;
|
||||
/* ---- HACK ---- */
|
||||
|
||||
struct xrt_prober *prober;
|
||||
|
||||
//! Enabled extensions
|
||||
|
|
|
|||
|
|
@ -16,14 +16,17 @@ set(RUNTIME_TARGET ${RUNTIME_PREFIX}openxr${RUNTIME_SUFFIX} CACHE INTERNAL "" FO
|
|||
set(XR_API_MAJOR "1")
|
||||
|
||||
include_directories(
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../../../external
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../../targets/common
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../../auxiliary
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../../include
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../../drivers
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../../state_trackers
|
||||
)
|
||||
|
||||
set(SOURCE_FILES
|
||||
target.c
|
||||
oxr_sdl2_hack.c
|
||||
)
|
||||
|
||||
# depends on above generated files
|
||||
|
|
@ -37,12 +40,12 @@ add_library(${RUNTIME_TARGET} SHARED
|
|||
$<TARGET_OBJECTS:aux_math>
|
||||
$<TARGET_OBJECTS:comp>
|
||||
$<TARGET_OBJECTS:st_oxr>
|
||||
$<TARGET_OBJECTS:st_gui>
|
||||
$<TARGET_OBJECTS:st_prober>
|
||||
$<TARGET_OBJECTS:target_lists>
|
||||
)
|
||||
|
||||
target_link_libraries(${RUNTIME_TARGET}
|
||||
PUBLIC
|
||||
target_link_libraries(${RUNTIME_TARGET} PUBLIC
|
||||
${LIBUVC_LIBRARIES}
|
||||
${LIBUSB_LIBRARIES}
|
||||
${Vulkan_LIBRARIES}
|
||||
|
|
@ -53,11 +56,29 @@ target_link_libraries(${RUNTIME_TARGET}
|
|||
)
|
||||
|
||||
if(DRIVER_OBJECTS)
|
||||
target_sources(${RUNTIME_TARGET} PRIVATE ${DRIVER_OBJECTS})
|
||||
target_sources(${RUNTIME_TARGET} PRIVATE
|
||||
${DRIVER_OBJECTS}
|
||||
)
|
||||
endif()
|
||||
|
||||
if(DRIVER_LIBRARIES)
|
||||
target_link_libraries(${RUNTIME_TARGET} PRIVATE ${DRIVER_LIBRARIES})
|
||||
target_link_libraries(${RUNTIME_TARGET} PRIVATE
|
||||
${DRIVER_LIBRARIES}
|
||||
)
|
||||
endif()
|
||||
|
||||
if(BUILD_WITH_SDL2)
|
||||
include_directories(${SDL2_INCLUDE_DIRS})
|
||||
|
||||
target_link_libraries(${RUNTIME_TARGET} PUBLIC
|
||||
${SDL2_LIBRARIES}
|
||||
X11 # HACK HACK HACK HACK
|
||||
)
|
||||
|
||||
target_sources(${RUNTIME_TARGET} PRIVATE
|
||||
../../../external/imgui/imgui_impl_sdl.cpp
|
||||
../../../external/imgui/imgui_impl_sdl.h
|
||||
)
|
||||
endif()
|
||||
|
||||
include(GNUInstallDirs)
|
||||
|
|
@ -66,7 +87,8 @@ include(GNUInstallDirs)
|
|||
install(TARGETS ${RUNTIME_TARGET}
|
||||
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
||||
)
|
||||
|
||||
|
||||
# $LIBPATH is a generator expression that is evaluated after configure_file, so we have to use file(GENERATE) instead
|
||||
|
|
|
|||
|
|
@ -16,9 +16,32 @@ runtime_target = '@0@openxr@1@'.format(runtime_prefix, runtime_suffix)
|
|||
# OpenXR 1.0
|
||||
xr_api_major = 1
|
||||
|
||||
hack_deps = []
|
||||
hack_src = []
|
||||
hack_libs = []
|
||||
hack_incs = []
|
||||
|
||||
if sdl2.found()
|
||||
hack_deps += sdl2
|
||||
hack_src += [
|
||||
'oxr_sdl2_hack.c',
|
||||
'../../../external/imgui/imgui_impl_sdl.cpp',
|
||||
'../../../external/imgui/imgui_impl_sdl.h',
|
||||
]
|
||||
hack_libs += lib_st_gui
|
||||
hack_incs += [
|
||||
st_include,
|
||||
]
|
||||
else
|
||||
hack_src += 'oxr_sdl2_hack.c'
|
||||
endif
|
||||
|
||||
openxr = library(
|
||||
runtime_target,
|
||||
files('target.c'),
|
||||
files(
|
||||
'target.c',
|
||||
hack_src,
|
||||
),
|
||||
link_whole: [
|
||||
lib_aux_os,
|
||||
lib_aux_ogl,
|
||||
|
|
@ -28,13 +51,15 @@ openxr = library(
|
|||
lib_st_oxr,
|
||||
lib_st_prober,
|
||||
lib_target_lists,
|
||||
] + driver_libs,
|
||||
] + driver_libs + hack_libs,
|
||||
include_directories: [
|
||||
external_include,
|
||||
st_include, # Sigh debian meson requires this.
|
||||
aux_include,
|
||||
common_include,
|
||||
drv_include,
|
||||
xrt_include,
|
||||
],
|
||||
] + hack_incs,
|
||||
dependencies: [
|
||||
libusb,
|
||||
libuvc,
|
||||
|
|
@ -46,7 +71,7 @@ openxr = library(
|
|||
x11,
|
||||
xcb,
|
||||
xcb_randr,
|
||||
] + driver_deps,
|
||||
] + driver_deps + hack_deps,
|
||||
install: true,
|
||||
)
|
||||
|
||||
|
|
|
|||
295
src/xrt/targets/openxr/oxr_sdl2_hack.c
Normal file
295
src/xrt/targets/openxr/oxr_sdl2_hack.c
Normal file
|
|
@ -0,0 +1,295 @@
|
|||
// Copyright 2019, Collabora, Ltd.
|
||||
// SPDX-License-Identifier: BSL-1.0
|
||||
/*!
|
||||
* @file
|
||||
* @brief Hacky SDL integration
|
||||
* @author Jakob Bornecrantz <jakob@collabora.com>
|
||||
*/
|
||||
|
||||
#include "util/u_var.h"
|
||||
#include "util/u_misc.h"
|
||||
#include "util/u_debug.h"
|
||||
|
||||
#include "os/os_threading.h"
|
||||
#include "ogl/ogl_api.h"
|
||||
|
||||
#include "gui/gui_common.h"
|
||||
#include "gui/gui_imgui.h"
|
||||
|
||||
|
||||
#ifndef XRT_HAVE_SDL2
|
||||
|
||||
int
|
||||
oxr_sdl2_hack_create(void **out_hack)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
void
|
||||
oxr_sdl2_hack_start(void *hack, struct xrt_prober *xp)
|
||||
{}
|
||||
|
||||
void
|
||||
oxr_sdl2_hack_stop(void *hack)
|
||||
{}
|
||||
|
||||
#else
|
||||
|
||||
#include <SDL2/SDL.h>
|
||||
|
||||
DEBUG_GET_ONCE_BOOL_OPTION(gui, "OXR_DEBUG_GUI", false)
|
||||
|
||||
|
||||
/*!
|
||||
* Common struct holding state for the GUI interface.
|
||||
*/
|
||||
struct sdl2_program
|
||||
{
|
||||
struct gui_program base;
|
||||
|
||||
SDL_GLContext ctx;
|
||||
SDL_Window *win;
|
||||
|
||||
struct os_thread_helper oth;
|
||||
|
||||
bool sdl_initialized;
|
||||
};
|
||||
|
||||
struct gui_imgui
|
||||
{
|
||||
bool show_demo_window;
|
||||
struct xrt_colour_rgb_f32 clear;
|
||||
};
|
||||
|
||||
static void
|
||||
sdl2_init(struct sdl2_program *p)
|
||||
{
|
||||
if (SDL_Init(SDL_INIT_EVERYTHING) < 0) {
|
||||
fprintf(stderr, "Failed to init SDL2!\n");
|
||||
return;
|
||||
}
|
||||
p->sdl_initialized = true;
|
||||
|
||||
const char *title = "Monado! ☺";
|
||||
int x = SDL_WINDOWPOS_UNDEFINED;
|
||||
int y = SDL_WINDOWPOS_UNDEFINED;
|
||||
int w = 1920;
|
||||
int h = 1080;
|
||||
|
||||
SDL_GL_SetAttribute(SDL_GL_CONTEXT_FLAGS, 0);
|
||||
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3);
|
||||
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 2);
|
||||
SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
|
||||
SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 24);
|
||||
SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 8);
|
||||
SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK,
|
||||
SDL_GL_CONTEXT_PROFILE_CORE);
|
||||
SDL_GL_SetAttribute(SDL_GL_CONTEXT_FLAGS,
|
||||
SDL_GL_CONTEXT_FORWARD_COMPATIBLE_FLAG);
|
||||
|
||||
SDL_WindowFlags window_flags = 0;
|
||||
window_flags |= SDL_WINDOW_SHOWN;
|
||||
window_flags |= SDL_WINDOW_OPENGL;
|
||||
window_flags |= SDL_WINDOW_RESIZABLE;
|
||||
window_flags |= SDL_WINDOW_ALLOW_HIGHDPI;
|
||||
#if 0
|
||||
window_flags |= SDL_WINDOW_MAXIMIZED;
|
||||
#endif
|
||||
|
||||
p->win = SDL_CreateWindow(title, x, y, w, h, window_flags);
|
||||
if (p->win == NULL) {
|
||||
fprintf(stderr, "Failed to create window!\n");
|
||||
return;
|
||||
}
|
||||
|
||||
p->ctx = SDL_GL_CreateContext(p->win);
|
||||
if (p->ctx == NULL) {
|
||||
fprintf(stderr, "Failed to create GL context!\n");
|
||||
return;
|
||||
}
|
||||
|
||||
SDL_GL_MakeCurrent(p->win, p->ctx);
|
||||
SDL_GL_SetSwapInterval(1); // Enable vsync
|
||||
|
||||
// Setup OpenGL bindings.
|
||||
bool err = gladLoadGL((GLADloadfunc)SDL_GL_GetProcAddress) == 0;
|
||||
if (err) {
|
||||
fprintf(stderr, "Failed to load GL functions!\n");
|
||||
return;
|
||||
}
|
||||
|
||||
// To manage the scenes.
|
||||
gui_scene_manager_init(&p->base);
|
||||
|
||||
// Start the scene.
|
||||
gui_scene_debug(&p->base);
|
||||
}
|
||||
|
||||
static void
|
||||
sdl2_loop(struct sdl2_program *p)
|
||||
{
|
||||
// Need to call this before any other Imgui call.
|
||||
igCreateContext(NULL);
|
||||
|
||||
// Local state
|
||||
ImGuiIO *io = igGetIO();
|
||||
|
||||
// Setup Platform/Renderer bindings
|
||||
igImGui_ImplSDL2_InitForOpenGL(p->win, p->ctx);
|
||||
igImGui_ImplOpenGL3_Init(NULL);
|
||||
|
||||
// Setup Dear ImGui style
|
||||
igStyleColorsDark(NULL);
|
||||
|
||||
// Main loop
|
||||
struct gui_imgui gui = {0};
|
||||
gui.clear.r = 0.45f;
|
||||
gui.clear.g = 0.55f;
|
||||
gui.clear.b = 0.60f;
|
||||
u_var_add_root(&gui, "GUI Control", false);
|
||||
u_var_add_rgb_f32(&gui, &gui.clear, "Clear Colour");
|
||||
u_var_add_bool(&gui, &gui.show_demo_window, "Demo Window");
|
||||
u_var_add_bool(&gui, &p->base.stopped, "Exit");
|
||||
|
||||
while (!p->base.stopped) {
|
||||
SDL_Event event;
|
||||
|
||||
while (SDL_PollEvent(&event)) {
|
||||
igImGui_ImplSDL2_ProcessEvent(&event);
|
||||
|
||||
if (event.type == SDL_QUIT) {
|
||||
p->base.stopped = true;
|
||||
}
|
||||
|
||||
if (event.type == SDL_WINDOWEVENT &&
|
||||
event.window.event == SDL_WINDOWEVENT_CLOSE &&
|
||||
event.window.windowID == SDL_GetWindowID(p->win)) {
|
||||
p->base.stopped = true;
|
||||
}
|
||||
}
|
||||
|
||||
// Start the Dear ImGui frame
|
||||
igImGui_ImplOpenGL3_NewFrame();
|
||||
igImGui_ImplSDL2_NewFrame(p->win);
|
||||
|
||||
// Start new frame.
|
||||
igNewFrame();
|
||||
|
||||
// Render the scene into it.
|
||||
gui_scene_manager_render(&p->base);
|
||||
|
||||
// Handle this here.
|
||||
if (gui.show_demo_window) {
|
||||
igShowDemoWindow(&gui.show_demo_window);
|
||||
}
|
||||
|
||||
// Build the DrawData (EndFrame).
|
||||
igRender();
|
||||
|
||||
// Clear the background.
|
||||
glViewport(0, 0, (int)io->DisplaySize.x,
|
||||
(int)io->DisplaySize.y);
|
||||
glClearColor(gui.clear.r, gui.clear.g, gui.clear.b, 1.0f);
|
||||
glClear(GL_COLOR_BUFFER_BIT);
|
||||
|
||||
igImGui_ImplOpenGL3_RenderDrawData(igGetDrawData());
|
||||
|
||||
SDL_GL_SwapWindow(p->win);
|
||||
|
||||
gui_prober_update(&p->base);
|
||||
}
|
||||
|
||||
// Cleanup
|
||||
u_var_remove_root(&gui);
|
||||
igImGui_ImplOpenGL3_Shutdown();
|
||||
igImGui_ImplSDL2_Shutdown();
|
||||
igDestroyContext(NULL);
|
||||
}
|
||||
|
||||
static void
|
||||
sdl2_close(struct sdl2_program *p)
|
||||
{
|
||||
// All scenes should be destroyed by now.
|
||||
gui_scene_manager_destroy(&p->base);
|
||||
|
||||
if (p->ctx != NULL) {
|
||||
SDL_GL_DeleteContext(p->ctx);
|
||||
p->ctx = NULL;
|
||||
}
|
||||
|
||||
if (p->win != NULL) {
|
||||
SDL_DestroyWindow(p->win);
|
||||
p->win = NULL;
|
||||
}
|
||||
|
||||
if (p->sdl_initialized) {
|
||||
SDL_Quit();
|
||||
p->sdl_initialized = false;
|
||||
}
|
||||
}
|
||||
|
||||
static void *
|
||||
oxr_sdl2_hack_run_thread(void *ptr)
|
||||
{
|
||||
struct sdl2_program *p = (struct sdl2_program *)ptr;
|
||||
|
||||
sdl2_init(p);
|
||||
|
||||
sdl2_loop(p);
|
||||
|
||||
sdl2_close(p);
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
int
|
||||
oxr_sdl2_hack_create(void **out_hack)
|
||||
{
|
||||
// Enabled?
|
||||
if (!debug_get_bool_option_gui()) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
// Need to do this as early as possible.
|
||||
u_var_force_on();
|
||||
|
||||
struct sdl2_program *p = U_TYPED_CALLOC(struct sdl2_program);
|
||||
if (p == NULL) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
*out_hack = p;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
void
|
||||
oxr_sdl2_hack_start(void *hack, struct xrt_prober *xp)
|
||||
{
|
||||
struct sdl2_program *p = (struct sdl2_program *)hack;
|
||||
if (p == NULL) {
|
||||
return;
|
||||
}
|
||||
|
||||
p->base.xp = xp;
|
||||
|
||||
(void)os_thread_helper_start(&p->oth, oxr_sdl2_hack_run_thread, p);
|
||||
}
|
||||
|
||||
void
|
||||
oxr_sdl2_hack_stop(void *hack)
|
||||
{
|
||||
struct sdl2_program *p = (struct sdl2_program *)hack;
|
||||
if (p == NULL) {
|
||||
return;
|
||||
}
|
||||
|
||||
// HACK!
|
||||
p->base.stopped = true;
|
||||
|
||||
// Destroy the thread object.
|
||||
os_thread_helper_destroy(&p->oth);
|
||||
|
||||
free(p);
|
||||
}
|
||||
#endif
|
||||
Loading…
Reference in a new issue