The open source OpenXR runtime
st/oxr: Remove unneeded prefixes on functions [NFC]
+30
-30
+5
-5
src/xrt/state_trackers/oxr/oxr_swapchain_d3d11.c
+5
-5
src/xrt/state_trackers/oxr/oxr_swapchain_d3d11.c
···
19
19
20
20
21
21
static XrResult
22
-
oxr_swapchain_d3d11_enumerate_images(struct oxr_logger *log,
23
-
struct oxr_swapchain *sc,
24
-
uint32_t count,
25
-
XrSwapchainImageBaseHeader *images)
22
+
d3d11_enumerate_images(struct oxr_logger *log,
23
+
struct oxr_swapchain *sc,
24
+
uint32_t count,
25
+
XrSwapchainImageBaseHeader *images)
26
26
{
27
27
struct xrt_swapchain_d3d11 *xscd3d = (struct xrt_swapchain_d3d11 *)sc->swapchain;
28
28
XrSwapchainImageD3D11KHR *d3d_imgs = (XrSwapchainImageD3D11KHR *)images;
···
49
49
}
50
50
51
51
// Set our API specific function(s).
52
-
sc->enumerate_images = oxr_swapchain_d3d11_enumerate_images;
52
+
sc->enumerate_images = d3d11_enumerate_images;
53
53
54
54
*out_swapchain = sc;
55
55
+5
-5
src/xrt/state_trackers/oxr/oxr_swapchain_d3d12.c
+5
-5
src/xrt/state_trackers/oxr/oxr_swapchain_d3d12.c
···
20
20
21
21
22
22
static XrResult
23
-
oxr_swapchain_d3d12_enumerate_images(struct oxr_logger *log,
24
-
struct oxr_swapchain *sc,
25
-
uint32_t count,
26
-
XrSwapchainImageBaseHeader *images)
23
+
d3d12_enumerate_images(struct oxr_logger *log,
24
+
struct oxr_swapchain *sc,
25
+
uint32_t count,
26
+
XrSwapchainImageBaseHeader *images)
27
27
{
28
28
struct xrt_swapchain_d3d12 *xscd3d = (struct xrt_swapchain_d3d12 *)sc->swapchain;
29
29
XrSwapchainImageD3D12KHR *d3d_imgs = (XrSwapchainImageD3D12KHR *)images;
···
57
57
}
58
58
59
59
// Set our API specific function(s).
60
-
sc->enumerate_images = oxr_swapchain_d3d12_enumerate_images;
60
+
sc->enumerate_images = d3d12_enumerate_images;
61
61
62
62
*out_swapchain = sc;
63
63
+15
-15
src/xrt/state_trackers/oxr/oxr_swapchain_gl.c
+15
-15
src/xrt/state_trackers/oxr/oxr_swapchain_gl.c
···
22
22
23
23
#if defined(XR_USE_GRAPHICS_API_OPENGL)
24
24
static XrResult
25
-
oxr_swapchain_gl_enumerate_images_gl(struct oxr_logger *log,
26
-
struct oxr_swapchain *sc,
27
-
uint32_t count,
28
-
XrSwapchainImageOpenGLKHR *images)
25
+
gl_enumerate_images_gl(struct oxr_logger *log,
26
+
struct oxr_swapchain *sc,
27
+
uint32_t count,
28
+
XrSwapchainImageOpenGLKHR *images)
29
29
{
30
30
struct xrt_swapchain_gl *xsc = (struct xrt_swapchain_gl *)sc->swapchain;
31
31
for (uint32_t i = 0; i < count; i++) {
···
42
42
43
43
#if defined(XR_USE_GRAPHICS_API_OPENGL_ES)
44
44
static XrResult
45
-
oxr_swapchain_gl_enumerate_images_gles(struct oxr_logger *log,
46
-
struct oxr_swapchain *sc,
47
-
uint32_t count,
48
-
XrSwapchainImageOpenGLESKHR *images)
45
+
gl_enumerate_images_gles(struct oxr_logger *log,
46
+
struct oxr_swapchain *sc,
47
+
uint32_t count,
48
+
XrSwapchainImageOpenGLESKHR *images)
49
49
{
50
50
struct xrt_swapchain_gl *xsc = (struct xrt_swapchain_gl *)sc->swapchain;
51
51
for (uint32_t i = 0; i < count; i++) {
···
60
60
#endif // XR_USE_GRAPHICS_API_OPENGL_ES
61
61
62
62
static XrResult
63
-
oxr_swapchain_gl_enumerate_images(struct oxr_logger *log,
64
-
struct oxr_swapchain *sc,
65
-
uint32_t count,
66
-
XrSwapchainImageBaseHeader *images)
63
+
gl_enumerate_images(struct oxr_logger *log,
64
+
struct oxr_swapchain *sc,
65
+
uint32_t count,
66
+
XrSwapchainImageBaseHeader *images)
67
67
{
68
68
assert(count > 0);
69
69
switch (images[0].type) {
70
70
#if defined(XR_USE_GRAPHICS_API_OPENGL)
71
71
case XR_TYPE_SWAPCHAIN_IMAGE_OPENGL_KHR:
72
-
return oxr_swapchain_gl_enumerate_images_gl(log, sc, count, (XrSwapchainImageOpenGLKHR *)images);
72
+
return gl_enumerate_images_gl(log, sc, count, (XrSwapchainImageOpenGLKHR *)images);
73
73
#endif // XR_USE_GRAPHICS_API_OPENGL
74
74
#if defined(XR_USE_GRAPHICS_API_OPENGL_ES)
75
75
case XR_TYPE_SWAPCHAIN_IMAGE_OPENGL_ES_KHR:
76
-
return oxr_swapchain_gl_enumerate_images_gles(log, sc, count, (XrSwapchainImageOpenGLESKHR *)images);
76
+
return gl_enumerate_images_gles(log, sc, count, (XrSwapchainImageOpenGLESKHR *)images);
77
77
#endif // XR_USE_GRAPHICS_API_OPENGL_ES
78
78
default: return oxr_error(log, XR_ERROR_VALIDATION_FAILURE, "Unsupported XrSwapchainImageBaseHeader type");
79
79
}
···
94
94
}
95
95
96
96
// Set our API specific function(s).
97
-
sc->enumerate_images = oxr_swapchain_gl_enumerate_images;
97
+
sc->enumerate_images = gl_enumerate_images;
98
98
99
99
*out_swapchain = sc;
100
100
+5
-5
src/xrt/state_trackers/oxr/oxr_swapchain_vk.c
+5
-5
src/xrt/state_trackers/oxr/oxr_swapchain_vk.c
···
17
17
18
18
19
19
static XrResult
20
-
oxr_swapchain_vk_enumerate_images(struct oxr_logger *log,
21
-
struct oxr_swapchain *sc,
22
-
uint32_t count,
23
-
XrSwapchainImageBaseHeader *images)
20
+
vk_enumerate_images(struct oxr_logger *log,
21
+
struct oxr_swapchain *sc,
22
+
uint32_t count,
23
+
XrSwapchainImageBaseHeader *images)
24
24
{
25
25
struct xrt_swapchain_vk *xscvk = (struct xrt_swapchain_vk *)sc->swapchain;
26
26
XrSwapchainImageVulkanKHR *vk_imgs = (XrSwapchainImageVulkanKHR *)images;
···
47
47
}
48
48
49
49
// Set our API specific function(s).
50
-
sc->enumerate_images = oxr_swapchain_vk_enumerate_images;
50
+
sc->enumerate_images = vk_enumerate_images;
51
51
52
52
*out_swapchain = sc;
53
53