The open source OpenXR runtime
c/main: Use get_vk more
+16
-3
+7
-1
src/xrt/compositor/main/comp_window_direct_nvidia.c
+7
-1
src/xrt/compositor/main/comp_window_direct_nvidia.c
···
68
68
*
69
69
*/
70
70
71
+
static inline struct vk_bundle *
72
+
get_vk(struct comp_target *ct)
73
+
{
74
+
return &ct->c->vk;
75
+
}
76
+
71
77
static void
72
78
_flush(struct comp_target *ct)
73
79
{
···
163
169
comp_window_direct_nvidia_init(struct comp_target *ct)
164
170
{
165
171
struct comp_window_direct_nvidia *w_direct = (struct comp_window_direct_nvidia *)ct;
166
-
struct vk_bundle *vk = &ct->c->vk;
172
+
struct vk_bundle *vk = get_vk(ct);
167
173
168
174
// Sanity check.
169
175
if (vk->instance == VK_NULL_HANDLE) {
+2
-1
src/xrt/compositor/main/comp_window_direct_randr.c
+2
-1
src/xrt/compositor/main/comp_window_direct_randr.c
···
174
174
comp_window_direct_randr_init(struct comp_target *ct)
175
175
{
176
176
struct comp_window_direct_randr *w_direct = (struct comp_window_direct_randr *)ct;
177
+
struct vk_bundle *vk = get_vk(w_direct);
177
178
178
179
// Sanity check.
179
-
if (ct->c->vk.instance != VK_NULL_HANDLE) {
180
+
if (vk->instance != VK_NULL_HANDLE) {
180
181
COMP_ERROR(ct->c, "Vulkan initialized before RANDR init!");
181
182
return false;
182
183
}
+7
-1
src/xrt/compositor/main/comp_window_vk_display.c
+7
-1
src/xrt/compositor/main/comp_window_vk_display.c
···
66
66
*
67
67
*/
68
68
69
+
static inline struct vk_bundle *
70
+
get_vk(struct comp_target *ct)
71
+
{
72
+
return &ct->c->vk;
73
+
}
74
+
69
75
static void
70
76
_flush(struct comp_target *ct)
71
77
{
···
152
158
comp_window_vk_display_init(struct comp_target *ct)
153
159
{
154
160
struct comp_window_vk_display *w_direct = (struct comp_window_vk_display *)ct;
155
-
struct vk_bundle *vk = &ct->c->vk;
161
+
struct vk_bundle *vk = get_vk(ct);
156
162
157
163
// Sanity check.
158
164
if (vk->instance == VK_NULL_HANDLE) {