mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-01-01 12:46:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

t/sdl_test: Fix macro collision on Windows

Browse source
This commit is contained in:
Ryan Pavlik 2023-05-16 16:13:03 -05:00 committed by Jakob Bornecrantz
parent 8603e5d63e
commit 173b36c3a2
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/xrt/targets/sdl_test/sdl_internal.h
View file

@ -214,14 +214,14 @@ from_comp(struct xrt_compositor *xc)
* @relates sdl_program * @relates sdl_program
* @ingroup sdl_test * @ingroup sdl_test
*/ */
#define SP_TRACE(sp, ...) U_LOG_IFL_T(sp->log_level, __VA_ARGS__); #define ST_TRACE(sp, ...) U_LOG_IFL_T(sp->log_level, __VA_ARGS__);
/*! /*!
* Debug level logging. * Debug level logging.
* *
* @relates sdl_program * @relates sdl_program
*/ */
#define SP_DEBUG(sp, ...) U_LOG_IFL_D(sp->log_level, __VA_ARGS__); #define ST_DEBUG(sp, ...) U_LOG_IFL_D(sp->log_level, __VA_ARGS__);
/*! /*!
* Info level logging. * Info level logging.
@ -229,7 +229,7 @@ from_comp(struct xrt_compositor *xc)
* @relates sdl_program * @relates sdl_program
* @ingroup sdl_test * @ingroup sdl_test
*/ */
#define SP_INFO(sp, ...) U_LOG_IFL_I(sp->log_level, __VA_ARGS__); #define ST_INFO(sp, ...) U_LOG_IFL_I(sp->log_level, __VA_ARGS__);
/*! /*!
* Warn level logging. * Warn level logging.
@ -237,7 +237,7 @@ from_comp(struct xrt_compositor *xc)
* @relates sdl_program * @relates sdl_program
* @ingroup sdl_test * @ingroup sdl_test
*/ */
#define SP_WARN(sp, ...) U_LOG_IFL_W(sp->log_level, __VA_ARGS__); #define ST_WARN(sp, ...) U_LOG_IFL_W(sp->log_level, __VA_ARGS__);
/*! /*!
* Error level logging. * Error level logging.
@ -245,7 +245,7 @@ from_comp(struct xrt_compositor *xc)
* @relates sdl_program * @relates sdl_program
* @ingroup sdl_test * @ingroup sdl_test
*/ */
#define SP_ERROR(sp, ...) U_LOG_IFL_E(sp->log_level, __VA_ARGS__); #define ST_ERROR(sp, ...) U_LOG_IFL_E(sp->log_level, __VA_ARGS__);
/*! /*!
* Check for OpenGL errors, context needs to be current. * Check for OpenGL errors, context needs to be current.

4
src/xrt/targets/sdl_test/sdl_swapchain.c
View file

@ -45,7 +45,7 @@ vk_format_to_gl(int64_t format)
static void static void
post_init_setup(struct sdl_swapchain *ssc, struct sdl_program *sp, const struct xrt_swapchain_create_info *info) post_init_setup(struct sdl_swapchain *ssc, struct sdl_program *sp, const struct xrt_swapchain_create_info *info)
{ {
SP_DEBUG(sp, "CREATE"); ST_DEBUG(sp, "CREATE");
// Setup fields // Setup fields
ssc->sp = sp; ssc->sp = sp;
@ -114,7 +114,7 @@ really_destroy(struct comp_swapchain *sc)
struct sdl_swapchain *ssc = (struct sdl_swapchain *)sc; struct sdl_swapchain *ssc = (struct sdl_swapchain *)sc;
struct sdl_program *sp = ssc->sp; struct sdl_program *sp = ssc->sp;
SP_DEBUG(sp, "DESTROY"); ST_DEBUG(sp, "DESTROY");
sdl_make_current(sp); sdl_make_current(sp);