Skip to content

Commit

Permalink
[Vulkan] Create compute pipelines
Browse files Browse the repository at this point in the history
  • Loading branch information
@RobDangerous
RobDangerous committed Jan 24, 2024
1 parent d3932f0 commit f5132f6
Show file tree
Hide file tree
Showing 3 changed files with 112 additions and 34 deletions.
2 changes: 2 additions & 0 deletions Backends/Graphics5/Vulkan/Sources/kinc/backend/graphics5/Vulkan.c.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ VkResult kinc_vulkan_create_surface(VkInstance instance, int window_index, VkSur
#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))

void createDescriptorLayout(void);
void create_compute_descriptor_layout(void);
void set_image_layout(VkImage image, VkImageAspectFlags aspectMask, VkImageLayout old_image_layout, VkImageLayout new_image_layout);

// uint32_t current_buffer;
Expand Down Expand Up @@ -937,6 +938,7 @@ void kinc_g5_internal_init() {
err = vkCreateCommandPool(vk_ctx.device, &cmd_pool_info, NULL, &vk_ctx.cmd_pool);

createDescriptorLayout();
create_compute_descriptor_layout();
assert(!err);
}

Expand Down
126 changes: 100 additions & 26 deletions Backends/Graphics5/Vulkan/Sources/kinc/backend/graphics5/compute.c.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,58 @@
#include <kinc/math/core.h>

static void parse_shader(uint32_t *shader_source, int shader_length, kinc_internal_named_number *locations, kinc_internal_named_number *textureBindings,
kinc_internal_named_number *uniformOffsets);
kinc_internal_named_number *uniformOffsets);

static uint8_t constantsMemory[1024 * 4];
static VkShaderModule create_shader_module(const void *code, size_t size);

static int getMultipleOf16(int value) {
int ret = 16;
while (ret < value)
ret += 16;
return ret;
static VkDescriptorSetLayout compute_descriptor_layout;
static VkDescriptorPool compute_descriptor_pool;

static void create_compute_descriptor_layout(void) {
VkDescriptorSetLayoutBinding layoutBindings[18];
memset(layoutBindings, 0, sizeof(layoutBindings));

layoutBindings[0].binding = 0;
layoutBindings[0].descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC;
layoutBindings[0].descriptorCount = 1;
layoutBindings[0].stageFlags = VK_SHADER_STAGE_COMPUTE_BIT;
layoutBindings[0].pImmutableSamplers = NULL;

for (int i = 1; i < 18; ++i) {
layoutBindings[i].binding = i;
layoutBindings[i].descriptorType = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER;
layoutBindings[i].descriptorCount = 1;
layoutBindings[i].stageFlags = VK_SHADER_STAGE_COMPUTE_BIT;
layoutBindings[i].pImmutableSamplers = NULL;
}

VkDescriptorSetLayoutCreateInfo descriptor_layout = {0};
descriptor_layout.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO;
descriptor_layout.pNext = NULL;
descriptor_layout.bindingCount = 18;
descriptor_layout.pBindings = layoutBindings;

VkResult err = vkCreateDescriptorSetLayout(vk_ctx.device, &descriptor_layout, NULL, &compute_descriptor_layout);
assert(!err);

VkDescriptorPoolSize typeCounts[2];
memset(typeCounts, 0, sizeof(typeCounts));

typeCounts[0].type = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC;
typeCounts[0].descriptorCount = 2 * 1024;

typeCounts[1].type = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER;
typeCounts[1].descriptorCount = 16 * 1024;

VkDescriptorPoolCreateInfo pool_info = {0};
pool_info.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
pool_info.pNext = NULL;
pool_info.maxSets = 1024;
pool_info.poolSizeCount = 2;
pool_info.pPoolSizes = typeCounts;

err = vkCreateDescriptorPool(vk_ctx.device, &pool_info, NULL, &compute_descriptor_pool);
assert(!err);
}

void kinc_g5_compute_shader_init(kinc_g5_compute_shader *shader, void *_data, int length) {
Expand All @@ -22,6 +65,37 @@ void kinc_g5_compute_shader_init(kinc_g5_compute_shader *shader, void *_data, in
memset(shader->impl.texture_bindings, 0, sizeof(kinc_internal_named_number) * KINC_INTERNAL_NAMED_NUMBER_COUNT);
parse_shader((uint32_t *)_data, length, shader->impl.locations, shader->impl.texture_bindings, shader->impl.offsets);

VkPipelineLayoutCreateInfo pPipelineLayoutCreateInfo = {0};
pPipelineLayoutCreateInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO;
pPipelineLayoutCreateInfo.pNext = NULL;
pPipelineLayoutCreateInfo.setLayoutCount = 1;
pPipelineLayoutCreateInfo.pSetLayouts = &compute_descriptor_layout;

VkResult err = vkCreatePipelineLayout(vk_ctx.device, &pPipelineLayoutCreateInfo, NULL, &shader->impl.pipeline_layout);
assert(!err);

VkComputePipelineCreateInfo pipeline_info = {0};

memset(&pipeline_info, 0, sizeof(pipeline_info));
pipeline_info.sType = VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_CREATE_INFO;
pipeline_info.layout = shader->impl.pipeline_layout;

VkPipelineShaderStageCreateInfo shader_stage;
memset(&shader_stage, 0, sizeof(VkPipelineShaderStageCreateInfo));

shader_stage.sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO;
shader_stage.stage = VK_SHADER_STAGE_COMPUTE_BIT;
shader->impl.shader_module = create_shader_module(_data, (size_t)length);
shader_stage.module = shader->impl.shader_module;
shader_stage.pName = "main";

pipeline_info.stage = shader_stage;

err = vkCreateComputePipelines(vk_ctx.device, VK_NULL_HANDLE, 1, &pipeline_info, NULL, &shader->impl.pipeline);
assert(!err);

vkDestroyShaderModule(vk_ctx.device, shader->impl.shader_module, NULL);

/*shader->impl.length = (int)(length - index);
shader->impl.data = (uint8_t *)malloc(shader->impl.length);
assert(shader->impl.data != NULL);
Expand Down Expand Up @@ -70,8 +144,8 @@ void kinc_g5_compute_shader_init(kinc_g5_compute_shader *shader, void *_data, in
VkDescriptorSetLayout descriptor_set_layout;
if (vkCreateDescriptorSetLayout(vk_ctx.device, &layoutInfo, NULL, &descriptor_set_layout) != VK_SUCCESS) {
kinc_log(KINC_LOG_LEVEL_WARNING, "Could not initialize compute shader.");
return;
kinc_log(KINC_LOG_LEVEL_WARNING, "Could not initialize compute shader.");
return;
}
VkPipelineLayoutCreateInfo pipeline_layout_info = {0};
Expand All @@ -80,8 +154,8 @@ void kinc_g5_compute_shader_init(kinc_g5_compute_shader *shader, void *_data, in
pipeline_layout_info.pSetLayouts = &descriptor_set_layout;
if (vkCreatePipelineLayout(vk_ctx.device, &pipeline_layout_info, NULL, &shader->impl.pipeline_layout) != VK_SUCCESS) {
kinc_log(KINC_LOG_LEVEL_WARNING, "Could not initialize compute shader.");
return;
kinc_log(KINC_LOG_LEVEL_WARNING, "Could not initialize compute shader.");
return;
}
VkComputePipelineCreateInfo pipeline_info = {0};
Expand All @@ -91,8 +165,8 @@ void kinc_g5_compute_shader_init(kinc_g5_compute_shader *shader, void *_data, in
pipeline_info.stage = compute_shader_stage_info;
if (vkCreateComputePipelines(vk_ctx.device, VK_NULL_HANDLE, 1, &pipeline_info, NULL, &shader->impl.pipeline) != VK_SUCCESS) {
kinc_log(KINC_LOG_LEVEL_WARNING, "Could not initialize compute shader.");
return;
kinc_log(KINC_LOG_LEVEL_WARNING, "Could not initialize compute shader.");
return;
}*/
}

Expand All @@ -105,14 +179,14 @@ kinc_g5_constant_location_t kinc_g5_compute_shader_get_constant_location(kinc_g5

/*kinc_compute_internal_shader_constant_t *constant = findComputeConstant(shader->impl.constants, hash);
if (constant == NULL) {
location.impl.computeOffset = 0;
location.impl.computeOffset = 0;
}
else {
location.impl.computeOffset = constant->offset;
location.impl.computeOffset = constant->offset;
}
if (location.impl.computeOffset == 0) {
kinc_log(KINC_LOG_LEVEL_WARNING, "Uniform %s not found.", name);
kinc_log(KINC_LOG_LEVEL_WARNING, "Uniform %s not found.", name);
}*/

return location;
Expand All @@ -139,19 +213,19 @@ kinc_g5_texture_unit_t kinc_g5_compute_shader_get_texture_unit(kinc_g5_compute_s
/*kinc_internal_hash_index_t *compute_unit = findComputeTextureUnit(shader->impl.textures, hash);
if (compute_unit == NULL) {
#ifndef NDEBUG
static int notFoundCount = 0;
if (notFoundCount < 10) {
kinc_log(KINC_LOG_LEVEL_WARNING, "Sampler %s not found.", unitName);
++notFoundCount;
}
else if (notFoundCount == 10) {
kinc_log(KINC_LOG_LEVEL_WARNING, "Giving up on sampler not found messages.", unitName);
++notFoundCount;
}
static int notFoundCount = 0;
if (notFoundCount < 10) {
kinc_log(KINC_LOG_LEVEL_WARNING, "Sampler %s not found.", unitName);
++notFoundCount;
}
else if (notFoundCount == 10) {
kinc_log(KINC_LOG_LEVEL_WARNING, "Giving up on sampler not found messages.", unitName);
++notFoundCount;
}
#endif
}
else {
unit.stages[KINC_G5_SHADER_TYPE_COMPUTE] = compute_unit->index + unitOffset;
unit.stages[KINC_G5_SHADER_TYPE_COMPUTE] = compute_unit->index + unitOffset;
}*/
return unit;
}
18 changes: 10 additions & 8 deletions Backends/Graphics5/Vulkan/Sources/kinc/backend/graphics5/pipeline.c.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,8 @@ static void add_offset(uint32_t id, uint32_t offset) {
++offsets_size;
}

static void parse_shader(uint32_t*shader_source, int shader_length, kinc_internal_named_number *locations, kinc_internal_named_number *textureBindings,
kinc_internal_named_number *uniformOffsets) {
static void parse_shader(uint32_t *shader_source, int shader_length, kinc_internal_named_number *locations, kinc_internal_named_number *textureBindings,
kinc_internal_named_number *uniformOffsets) {
names_size = 0;
memberNames_size = 0;
locs_size = 0;
Expand Down Expand Up @@ -217,7 +217,7 @@ static void parse_shader(uint32_t*shader_source, int shader_length, kinc_interna
}
}

static VkShaderModule prepare_shader_module(const void *code, size_t size) {
static VkShaderModule create_shader_module(const void *code, size_t size) {
VkShaderModuleCreateInfo moduleCreateInfo;
moduleCreateInfo.sType = VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO;
moduleCreateInfo.pNext = NULL;
Expand All @@ -233,12 +233,12 @@ static VkShaderModule prepare_shader_module(const void *code, size_t size) {
}

static VkShaderModule prepare_vs(VkShaderModule *vert_shader_module, kinc_g5_shader_t *vertexShader) {
*vert_shader_module = prepare_shader_module(vertexShader->impl.source, vertexShader->impl.length);
*vert_shader_module = create_shader_module(vertexShader->impl.source, vertexShader->impl.length);
return *vert_shader_module;
}

static VkShaderModule prepare_fs(VkShaderModule *frag_shader_module, kinc_g5_shader_t *fragmentShader) {
*frag_shader_module = prepare_shader_module(fragmentShader->impl.source, fragmentShader->impl.length);
*frag_shader_module = create_shader_module(fragmentShader->impl.source, fragmentShader->impl.length);
return *frag_shader_module;
}

Expand Down Expand Up @@ -389,8 +389,10 @@ void kinc_g5_pipeline_compile(kinc_g5_pipeline_t *pipeline) {
memset(pipeline->impl.fragmentLocations, 0, sizeof(kinc_internal_named_number) * KINC_INTERNAL_NAMED_NUMBER_COUNT);
memset(pipeline->impl.fragmentOffsets, 0, sizeof(kinc_internal_named_number) * KINC_INTERNAL_NAMED_NUMBER_COUNT);
memset(pipeline->impl.textureBindings, 0, sizeof(kinc_internal_named_number) * KINC_INTERNAL_NAMED_NUMBER_COUNT);
parse_shader((uint32_t*)pipeline->vertexShader->impl.source, pipeline->vertexShader->impl.length, pipeline->impl.vertexLocations, pipeline->impl.textureBindings, pipeline->impl.vertexOffsets);
parse_shader((uint32_t*)pipeline->fragmentShader->impl.source, pipeline->fragmentShader->impl.length, pipeline->impl.fragmentLocations, pipeline->impl.textureBindings, pipeline->impl.fragmentOffsets);
parse_shader((uint32_t *)pipeline->vertexShader->impl.source, pipeline->vertexShader->impl.length, pipeline->impl.vertexLocations,
pipeline->impl.textureBindings, pipeline->impl.vertexOffsets);
parse_shader((uint32_t *)pipeline->fragmentShader->impl.source, pipeline->fragmentShader->impl.length, pipeline->impl.fragmentLocations,
pipeline->impl.textureBindings, pipeline->impl.fragmentOffsets);

VkPipelineLayoutCreateInfo pPipelineLayoutCreateInfo = {0};
pPipelineLayoutCreateInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO;
Expand Down Expand Up @@ -684,7 +686,7 @@ void kinc_g5_pipeline_compile(kinc_g5_pipeline_t *pipeline) {
vkDestroyShaderModule(vk_ctx.device, pipeline->impl.vert_shader_module, NULL);
}

void createDescriptorLayout() {
void createDescriptorLayout(void) {
VkDescriptorSetLayoutBinding layoutBindings[18];
memset(layoutBindings, 0, sizeof(layoutBindings));

Expand Down

0 comments on commit f5132f6

Please sign in to comment.