The open source OpenXR runtime
t/sdl_test: Fix macro collision on Windows
authored by
Ryan Pavlik
and committed by
Jakob Bornecrantz
173b36c3
8603e5d6
+7
-7
+5
-5
src/xrt/targets/sdl_test/sdl_internal.h
+5
-5
src/xrt/targets/sdl_test/sdl_internal.h
···
214
214
* @relates sdl_program
215
215
* @ingroup sdl_test
216
216
*/
217
-
#define SP_TRACE(sp, ...) U_LOG_IFL_T(sp->log_level, __VA_ARGS__);
217
+
#define ST_TRACE(sp, ...) U_LOG_IFL_T(sp->log_level, __VA_ARGS__);
218
218
219
219
/*!
220
220
* Debug level logging.
221
221
*
222
222
* @relates sdl_program
223
223
*/
224
-
#define SP_DEBUG(sp, ...) U_LOG_IFL_D(sp->log_level, __VA_ARGS__);
224
+
#define ST_DEBUG(sp, ...) U_LOG_IFL_D(sp->log_level, __VA_ARGS__);
225
225
226
226
/*!
227
227
* Info level logging.
···
229
229
* @relates sdl_program
230
230
* @ingroup sdl_test
231
231
*/
232
-
#define SP_INFO(sp, ...) U_LOG_IFL_I(sp->log_level, __VA_ARGS__);
232
+
#define ST_INFO(sp, ...) U_LOG_IFL_I(sp->log_level, __VA_ARGS__);
233
233
234
234
/*!
235
235
* Warn level logging.
···
237
237
* @relates sdl_program
238
238
* @ingroup sdl_test
239
239
*/
240
-
#define SP_WARN(sp, ...) U_LOG_IFL_W(sp->log_level, __VA_ARGS__);
240
+
#define ST_WARN(sp, ...) U_LOG_IFL_W(sp->log_level, __VA_ARGS__);
241
241
242
242
/*!
243
243
* Error level logging.
···
245
245
* @relates sdl_program
246
246
* @ingroup sdl_test
247
247
*/
248
-
#define SP_ERROR(sp, ...) U_LOG_IFL_E(sp->log_level, __VA_ARGS__);
248
+
#define ST_ERROR(sp, ...) U_LOG_IFL_E(sp->log_level, __VA_ARGS__);
249
249
250
250
/*!
251
251
* Check for OpenGL errors, context needs to be current.
+2
-2
src/xrt/targets/sdl_test/sdl_swapchain.c
+2
-2
src/xrt/targets/sdl_test/sdl_swapchain.c
···
45
45
static void
46
46
post_init_setup(struct sdl_swapchain *ssc, struct sdl_program *sp, const struct xrt_swapchain_create_info *info)
47
47
{
48
-
SP_DEBUG(sp, "CREATE");
48
+
ST_DEBUG(sp, "CREATE");
49
49
50
50
// Setup fields
51
51
ssc->sp = sp;
···
114
114
struct sdl_swapchain *ssc = (struct sdl_swapchain *)sc;
115
115
struct sdl_program *sp = ssc->sp;
116
116
117
-
SP_DEBUG(sp, "DESTROY");
117
+
ST_DEBUG(sp, "DESTROY");
118
118
119
119
sdl_make_current(sp);
120
120