Skip to content

Commit

Permalink
require vulkan 1.2, downgrade back to bullseye
Browse files Browse the repository at this point in the history
  • Loading branch information
jo-m committed Dec 20, 2023
1 parent 8902026 commit e1a7a78
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.PHONY: generate format lint test test_more bench check build_host build_arm64 docker_build docker_lint docker_test docker_test_more docker_bench clean run_confighelper run_camera run_videofile list

# https://hub.docker.com/_/debian
DOCKER_BASE_IMAGE = debian:bookworm-20231120
DOCKER_BASE_IMAGE = debian:bullseye-20231120
# https://go.dev/dl/
GO_VERSION = 1.21.5
GO_ARCHIVE_SHA256 = e2bc0b3e4b64111ec117295c088bde5f00eeed1567999ff77bc859d7df70078e
Expand Down
13 changes: 6 additions & 7 deletions pkg/vk/vk.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
#include <stdlib.h>
#include <string.h>

#ifndef VK_VERSION_1_3
#error Need at least Vulkan SDK 1.3
#ifndef VK_VERSION_1_2
#error Need at least Vulkan SDK 1.
#endif

#define RET_ON_ERR(expr) \
Expand Down Expand Up @@ -187,7 +187,7 @@ VkResult create_vk_handle(vk_handle* out, const bool enable_validation) {
info.applicationVersion = 0;
info.pEngineName = "";
info.engineVersion = 0;
info.apiVersion = VK_API_VERSION_1_0;
info.apiVersion = VK_API_VERSION_1_2;

VkInstanceCreateInfo create_info = {0};
create_info.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO;
Expand Down Expand Up @@ -253,11 +253,10 @@ int vk_handle_get_device_string(vk_handle* vk, char* str, size_t str_sz) {
const uint32_t v = props.apiVersion;
return snprintf(str, str_sz,
"name='%s' vendor_id=%u device_id=%u driver_version=%u "
"variant=%u api_version=%u.%u.%u type=%u",
"api_version=%u.%u.%u type=%u",
props.deviceName, props.vendorID, props.deviceID,
props.driverVersion, VK_API_VERSION_VARIANT(v),
VK_API_VERSION_MAJOR(v), VK_API_VERSION_MINOR(v),
VK_API_VERSION_PATCH(v), props.deviceType);
props.driverVersion, VK_VERSION_MAJOR(v),
VK_VERSION_MINOR(v), VK_VERSION_PATCH(v), props.deviceType);
}

void vk_handle_destroy(vk_handle* vk) {
Expand Down

0 comments on commit e1a7a78

Please sign in to comment.