The open source OpenXR runtime
aux/android/ahardwarebuffer_allocator: Use Vulkan enums in format switch.
authored by
Lubosz Sarnecki
and committed by
Ryan Pavlik
d61faff4
633b7839
+16
-20
+16
-20
src/xrt/auxiliary/android/android_ahardwarebuffer_allocator.c
+16
-20
src/xrt/auxiliary/android/android_ahardwarebuffer_allocator.c
···
14
14
#include "util/u_debug.h"
15
15
#include "util/u_handles.h"
16
16
17
+
#include "xrt/xrt_vulkan_includes.h"
18
+
17
19
#ifdef XRT_GRAPHICS_BUFFER_HANDLE_IS_AHARDWAREBUFFER
18
20
#include <android/hardware_buffer.h>
19
21
···
35
37
vk_format_to_ahardwarebuffer(uint64_t format)
36
38
{
37
39
switch (format) {
38
-
case 125 /*VK_FORMAT_X8_D24_UNORM_PACK32*/:
40
+
case VK_FORMAT_X8_D24_UNORM_PACK32:
39
41
return AHARDWAREBUFFER_FORMAT_D24_UNORM;
40
-
case 129 /*VK_FORMAT_D24_UNORM_S8_UINT*/:
42
+
case VK_FORMAT_D24_UNORM_S8_UINT:
41
43
return AHARDWAREBUFFER_FORMAT_D24_UNORM_S8_UINT;
42
-
case 4 /*VK_FORMAT_R5G6B5_UNORM_PACK16*/:
44
+
case VK_FORMAT_R5G6B5_UNORM_PACK16:
43
45
return AHARDWAREBUFFER_FORMAT_R5G6B5_UNORM;
44
-
case 124 /*VK_FORMAT_D16_UNORM*/:
45
-
return AHARDWAREBUFFER_FORMAT_D16_UNORM;
46
-
case 23 /*VK_FORMAT_R8G8B8_UNORM*/:
47
-
return AHARDWAREBUFFER_FORMAT_R8G8B8_UNORM;
48
-
case 130 /*VK_FORMAT_D32_SFLOAT_S8_UINT*/:
46
+
case VK_FORMAT_D16_UNORM: return AHARDWAREBUFFER_FORMAT_D16_UNORM;
47
+
case VK_FORMAT_R8G8B8_UNORM: return AHARDWAREBUFFER_FORMAT_R8G8B8_UNORM;
48
+
case VK_FORMAT_D32_SFLOAT_S8_UINT:
49
49
return AHARDWAREBUFFER_FORMAT_D32_FLOAT_S8_UINT;
50
-
case 64 /*VK_FORMAT_A2B10G10R10_UNORM_PACK32*/:
50
+
case VK_FORMAT_A2B10G10R10_UNORM_PACK32:
51
51
return AHARDWAREBUFFER_FORMAT_R10G10B10A2_UNORM;
52
-
case 127 /*VK_FORMAT_S8_UINT*/: return AHARDWAREBUFFER_FORMAT_S8_UINT;
53
-
case 126 /*VK_FORMAT_D32_SFLOAT*/:
54
-
return AHARDWAREBUFFER_FORMAT_D32_FLOAT;
55
-
case 97 /*VK_FORMAT_R16G16B16A16_SFLOAT*/:
52
+
case VK_FORMAT_S8_UINT: return AHARDWAREBUFFER_FORMAT_S8_UINT;
53
+
case VK_FORMAT_D32_SFLOAT: return AHARDWAREBUFFER_FORMAT_D32_FLOAT;
54
+
case VK_FORMAT_R16G16B16A16_SFLOAT:
56
55
return AHARDWAREBUFFER_FORMAT_R16G16B16A16_FLOAT;
57
-
case 43 /*VK_FORMAT_R8G8B8A8_SRGB*/:
58
-
return AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM /* apply
59
-
EGL_GL_COLORSPACE_KHR,
60
-
EGL_GL_COLORSPACE_SRGB_KHR!
61
-
*/
62
-
;
63
-
case 37 /*VK_FORMAT_R8G8B8A8_UNORM*/:
56
+
case VK_FORMAT_R8G8B8A8_SRGB:
57
+
/* apply EGL_GL_COLORSPACE_KHR, EGL_GL_COLORSPACE_SRGB_KHR! */
58
+
return AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM;
59
+
case VK_FORMAT_R8G8B8A8_UNORM:
64
60
return AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM;
65
61
default: return 0;
66
62
}