mirror of
https://gitlab.freedesktop.org/monado/monado.git
synced 2025-01-17 04:15:44 +00:00
st/oxr: Remove unneeded prefixes on functions [NFC]
This commit is contained in:
parent
52f790289d
commit
9055b9d2ec
|
@ -19,10 +19,10 @@
|
||||||
|
|
||||||
|
|
||||||
static XrResult
|
static XrResult
|
||||||
oxr_swapchain_d3d11_enumerate_images(struct oxr_logger *log,
|
d3d11_enumerate_images(struct oxr_logger *log,
|
||||||
struct oxr_swapchain *sc,
|
struct oxr_swapchain *sc,
|
||||||
uint32_t count,
|
uint32_t count,
|
||||||
XrSwapchainImageBaseHeader *images)
|
XrSwapchainImageBaseHeader *images)
|
||||||
{
|
{
|
||||||
struct xrt_swapchain_d3d11 *xscd3d = (struct xrt_swapchain_d3d11 *)sc->swapchain;
|
struct xrt_swapchain_d3d11 *xscd3d = (struct xrt_swapchain_d3d11 *)sc->swapchain;
|
||||||
XrSwapchainImageD3D11KHR *d3d_imgs = (XrSwapchainImageD3D11KHR *)images;
|
XrSwapchainImageD3D11KHR *d3d_imgs = (XrSwapchainImageD3D11KHR *)images;
|
||||||
|
@ -49,7 +49,7 @@ oxr_swapchain_d3d11_create(struct oxr_logger *log,
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set our API specific function(s).
|
// Set our API specific function(s).
|
||||||
sc->enumerate_images = oxr_swapchain_d3d11_enumerate_images;
|
sc->enumerate_images = d3d11_enumerate_images;
|
||||||
|
|
||||||
*out_swapchain = sc;
|
*out_swapchain = sc;
|
||||||
|
|
||||||
|
|
|
@ -20,10 +20,10 @@
|
||||||
|
|
||||||
|
|
||||||
static XrResult
|
static XrResult
|
||||||
oxr_swapchain_d3d12_enumerate_images(struct oxr_logger *log,
|
d3d12_enumerate_images(struct oxr_logger *log,
|
||||||
struct oxr_swapchain *sc,
|
struct oxr_swapchain *sc,
|
||||||
uint32_t count,
|
uint32_t count,
|
||||||
XrSwapchainImageBaseHeader *images)
|
XrSwapchainImageBaseHeader *images)
|
||||||
{
|
{
|
||||||
struct xrt_swapchain_d3d12 *xscd3d = (struct xrt_swapchain_d3d12 *)sc->swapchain;
|
struct xrt_swapchain_d3d12 *xscd3d = (struct xrt_swapchain_d3d12 *)sc->swapchain;
|
||||||
XrSwapchainImageD3D12KHR *d3d_imgs = (XrSwapchainImageD3D12KHR *)images;
|
XrSwapchainImageD3D12KHR *d3d_imgs = (XrSwapchainImageD3D12KHR *)images;
|
||||||
|
@ -57,7 +57,7 @@ oxr_swapchain_d3d12_create(struct oxr_logger *log,
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set our API specific function(s).
|
// Set our API specific function(s).
|
||||||
sc->enumerate_images = oxr_swapchain_d3d12_enumerate_images;
|
sc->enumerate_images = d3d12_enumerate_images;
|
||||||
|
|
||||||
*out_swapchain = sc;
|
*out_swapchain = sc;
|
||||||
|
|
||||||
|
|
|
@ -22,10 +22,10 @@
|
||||||
|
|
||||||
#if defined(XR_USE_GRAPHICS_API_OPENGL)
|
#if defined(XR_USE_GRAPHICS_API_OPENGL)
|
||||||
static XrResult
|
static XrResult
|
||||||
oxr_swapchain_gl_enumerate_images_gl(struct oxr_logger *log,
|
gl_enumerate_images_gl(struct oxr_logger *log,
|
||||||
struct oxr_swapchain *sc,
|
struct oxr_swapchain *sc,
|
||||||
uint32_t count,
|
uint32_t count,
|
||||||
XrSwapchainImageOpenGLKHR *images)
|
XrSwapchainImageOpenGLKHR *images)
|
||||||
{
|
{
|
||||||
struct xrt_swapchain_gl *xsc = (struct xrt_swapchain_gl *)sc->swapchain;
|
struct xrt_swapchain_gl *xsc = (struct xrt_swapchain_gl *)sc->swapchain;
|
||||||
for (uint32_t i = 0; i < count; i++) {
|
for (uint32_t i = 0; i < count; i++) {
|
||||||
|
@ -42,10 +42,10 @@ oxr_swapchain_gl_enumerate_images_gl(struct oxr_logger *log,
|
||||||
|
|
||||||
#if defined(XR_USE_GRAPHICS_API_OPENGL_ES)
|
#if defined(XR_USE_GRAPHICS_API_OPENGL_ES)
|
||||||
static XrResult
|
static XrResult
|
||||||
oxr_swapchain_gl_enumerate_images_gles(struct oxr_logger *log,
|
gl_enumerate_images_gles(struct oxr_logger *log,
|
||||||
struct oxr_swapchain *sc,
|
struct oxr_swapchain *sc,
|
||||||
uint32_t count,
|
uint32_t count,
|
||||||
XrSwapchainImageOpenGLESKHR *images)
|
XrSwapchainImageOpenGLESKHR *images)
|
||||||
{
|
{
|
||||||
struct xrt_swapchain_gl *xsc = (struct xrt_swapchain_gl *)sc->swapchain;
|
struct xrt_swapchain_gl *xsc = (struct xrt_swapchain_gl *)sc->swapchain;
|
||||||
for (uint32_t i = 0; i < count; i++) {
|
for (uint32_t i = 0; i < count; i++) {
|
||||||
|
@ -60,20 +60,20 @@ oxr_swapchain_gl_enumerate_images_gles(struct oxr_logger *log,
|
||||||
#endif // XR_USE_GRAPHICS_API_OPENGL_ES
|
#endif // XR_USE_GRAPHICS_API_OPENGL_ES
|
||||||
|
|
||||||
static XrResult
|
static XrResult
|
||||||
oxr_swapchain_gl_enumerate_images(struct oxr_logger *log,
|
gl_enumerate_images(struct oxr_logger *log,
|
||||||
struct oxr_swapchain *sc,
|
struct oxr_swapchain *sc,
|
||||||
uint32_t count,
|
uint32_t count,
|
||||||
XrSwapchainImageBaseHeader *images)
|
XrSwapchainImageBaseHeader *images)
|
||||||
{
|
{
|
||||||
assert(count > 0);
|
assert(count > 0);
|
||||||
switch (images[0].type) {
|
switch (images[0].type) {
|
||||||
#if defined(XR_USE_GRAPHICS_API_OPENGL)
|
#if defined(XR_USE_GRAPHICS_API_OPENGL)
|
||||||
case XR_TYPE_SWAPCHAIN_IMAGE_OPENGL_KHR:
|
case XR_TYPE_SWAPCHAIN_IMAGE_OPENGL_KHR:
|
||||||
return oxr_swapchain_gl_enumerate_images_gl(log, sc, count, (XrSwapchainImageOpenGLKHR *)images);
|
return gl_enumerate_images_gl(log, sc, count, (XrSwapchainImageOpenGLKHR *)images);
|
||||||
#endif // XR_USE_GRAPHICS_API_OPENGL
|
#endif // XR_USE_GRAPHICS_API_OPENGL
|
||||||
#if defined(XR_USE_GRAPHICS_API_OPENGL_ES)
|
#if defined(XR_USE_GRAPHICS_API_OPENGL_ES)
|
||||||
case XR_TYPE_SWAPCHAIN_IMAGE_OPENGL_ES_KHR:
|
case XR_TYPE_SWAPCHAIN_IMAGE_OPENGL_ES_KHR:
|
||||||
return oxr_swapchain_gl_enumerate_images_gles(log, sc, count, (XrSwapchainImageOpenGLESKHR *)images);
|
return gl_enumerate_images_gles(log, sc, count, (XrSwapchainImageOpenGLESKHR *)images);
|
||||||
#endif // XR_USE_GRAPHICS_API_OPENGL_ES
|
#endif // XR_USE_GRAPHICS_API_OPENGL_ES
|
||||||
default: return oxr_error(log, XR_ERROR_VALIDATION_FAILURE, "Unsupported XrSwapchainImageBaseHeader type");
|
default: return oxr_error(log, XR_ERROR_VALIDATION_FAILURE, "Unsupported XrSwapchainImageBaseHeader type");
|
||||||
}
|
}
|
||||||
|
@ -94,7 +94,7 @@ oxr_swapchain_gl_create(struct oxr_logger *log,
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set our API specific function(s).
|
// Set our API specific function(s).
|
||||||
sc->enumerate_images = oxr_swapchain_gl_enumerate_images;
|
sc->enumerate_images = gl_enumerate_images;
|
||||||
|
|
||||||
*out_swapchain = sc;
|
*out_swapchain = sc;
|
||||||
|
|
||||||
|
|
|
@ -17,10 +17,10 @@
|
||||||
|
|
||||||
|
|
||||||
static XrResult
|
static XrResult
|
||||||
oxr_swapchain_vk_enumerate_images(struct oxr_logger *log,
|
vk_enumerate_images(struct oxr_logger *log,
|
||||||
struct oxr_swapchain *sc,
|
struct oxr_swapchain *sc,
|
||||||
uint32_t count,
|
uint32_t count,
|
||||||
XrSwapchainImageBaseHeader *images)
|
XrSwapchainImageBaseHeader *images)
|
||||||
{
|
{
|
||||||
struct xrt_swapchain_vk *xscvk = (struct xrt_swapchain_vk *)sc->swapchain;
|
struct xrt_swapchain_vk *xscvk = (struct xrt_swapchain_vk *)sc->swapchain;
|
||||||
XrSwapchainImageVulkanKHR *vk_imgs = (XrSwapchainImageVulkanKHR *)images;
|
XrSwapchainImageVulkanKHR *vk_imgs = (XrSwapchainImageVulkanKHR *)images;
|
||||||
|
@ -47,7 +47,7 @@ oxr_swapchain_vk_create(struct oxr_logger *log,
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set our API specific function(s).
|
// Set our API specific function(s).
|
||||||
sc->enumerate_images = oxr_swapchain_vk_enumerate_images;
|
sc->enumerate_images = vk_enumerate_images;
|
||||||
|
|
||||||
*out_swapchain = sc;
|
*out_swapchain = sc;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue