Skip to content

Compile fixes #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Compile fixes #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc99f10
Fix compilation on modern systems
proski Oct 7, 2024
32378c8
Compile shader in the build directory
proski Oct 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,16 @@ include_directories(${Vulkan_INCLUDE_DIR})
add_executable(mandelbrot src/mandelbrot.cc src/lodepng.cpp src/vulkan_ext.c)

target_link_libraries(mandelbrot ${Vulkan_LIBRARY})

file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/shaders)

add_custom_target(shader
ALL
DEPENDS shaders/comp.spv
)

add_custom_command(
OUTPUT shaders/comp.spv
COMMAND glslc ${CMAKE_SOURCE_DIR}/shaders/shader.comp -o shaders/comp.spv
MAIN_DEPENDENCY ${CMAKE_SOURCE_DIR}/shaders/shader.comp
)
7 changes: 4 additions & 3 deletions src/mandelbrot.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ class MandelbrotApp {
for (const auto &layer_property : layer_props) {
std::cerr << " " << layer_property.layerName << "\t\t"
<< layer_property.description << std::endl;
if (std::string(layer_property.layerName) == kValidationLayer) {
if (std::string{kValidationLayer} == layer_property.layerName) {
enabled_layers_.push_back(kValidationLayer);
}
}
Expand All @@ -95,7 +95,7 @@ class MandelbrotApp {
<< std::endl;
for (const auto &extension_prop : extension_props) {
std::cerr << " " << extension_prop.extensionName << std::endl;
if (std::string(extension_prop.extensionName) == kDebugReportExtension) {
if (std::string{kDebugReportExtension} == extension_prop.extensionName) {
enabled_extensions_.push_back(kDebugReportExtension);
}
}
Expand Down Expand Up @@ -264,7 +264,8 @@ class MandelbrotApp {
auto pipeline_create_info = vk::ComputePipelineCreateInfo();
pipeline_create_info.setStage(shader_stage_create_info)
.setLayout(*pipeline_layout_);
pipeline_ = device_->createComputePipelineUnique({}, pipeline_create_info);
pipeline_ =
device_->createComputePipelineUnique({}, pipeline_create_info).value;
}

void CreateCommandPool() {
Expand Down