The open source OpenXR runtime
c/main: Do not copy vk_bundle
authored by
Jakob Bornecrantz
and committed by
Ryan Pavlik
9b6b5b7e
bd6e15c7
+6
-12
+3
-6
src/xrt/compositor/main/comp_window_direct_nvidia.c
+3
-6
src/xrt/compositor/main/comp_window_direct_nvidia.c
···
176
176
return false;
177
177
}
178
178
179
-
struct vk_bundle comp_vk = ct->c->vk;
180
-
181
179
// find our display using nvidia whitelist, enumerate its modes, and
182
180
// pick the best one get a list of attached displays
183
181
uint32_t display_count;
184
-
if (comp_vk.vkGetPhysicalDeviceDisplayPropertiesKHR(comp_vk.physical_device, &display_count, NULL) !=
185
-
VK_SUCCESS) {
182
+
if (vk->vkGetPhysicalDeviceDisplayPropertiesKHR(vk->physical_device, &display_count, NULL) != VK_SUCCESS) {
186
183
COMP_ERROR(ct->c, "Failed to get vulkan display count");
187
184
return false;
188
185
}
···
194
191
195
192
struct VkDisplayPropertiesKHR *display_props = U_TYPED_ARRAY_CALLOC(VkDisplayPropertiesKHR, display_count);
196
193
197
-
if (display_props && comp_vk.vkGetPhysicalDeviceDisplayPropertiesKHR(comp_vk.physical_device, &display_count,
198
-
display_props) != VK_SUCCESS) {
194
+
if (display_props && vk->vkGetPhysicalDeviceDisplayPropertiesKHR(vk->physical_device, &display_count,
195
+
display_props) != VK_SUCCESS) {
199
196
COMP_ERROR(ct->c, "Failed to get display properties");
200
197
free(display_props);
201
198
return false;
+3
-6
src/xrt/compositor/main/comp_window_vk_display.c
+3
-6
src/xrt/compositor/main/comp_window_vk_display.c
···
160
160
return false;
161
161
}
162
162
163
-
struct vk_bundle comp_vk = ct->c->vk;
164
-
165
163
uint32_t display_count;
166
-
if (comp_vk.vkGetPhysicalDeviceDisplayPropertiesKHR(comp_vk.physical_device, &display_count, NULL) !=
167
-
VK_SUCCESS) {
164
+
if (vk->vkGetPhysicalDeviceDisplayPropertiesKHR(vk->physical_device, &display_count, NULL) != VK_SUCCESS) {
168
165
COMP_ERROR(ct->c, "Failed to get vulkan display count");
169
166
return false;
170
167
}
···
176
173
177
174
struct VkDisplayPropertiesKHR *display_props = U_TYPED_ARRAY_CALLOC(VkDisplayPropertiesKHR, display_count);
178
175
179
-
if (display_props && comp_vk.vkGetPhysicalDeviceDisplayPropertiesKHR(comp_vk.physical_device, &display_count,
180
-
display_props) != VK_SUCCESS) {
176
+
if (display_props && vk->vkGetPhysicalDeviceDisplayPropertiesKHR(vk->physical_device, &display_count,
177
+
display_props) != VK_SUCCESS) {
181
178
COMP_ERROR(ct->c, "Failed to get display properties");
182
179
free(display_props);
183
180
return false;