diff --git a/aster/include/aster/systems/device.h b/aster/include/aster/systems/device.h index d6bf499..7f54314 100644 --- a/aster/include/aster/systems/device.h +++ b/aster/include/aster/systems/device.h @@ -542,15 +542,12 @@ class Device final PipelineCreationError CreateShaders(eastl::fixed_vector &shadersOut, Slang::ComPtr &program, std::span const &shaders); - systems::PipelineCreationError - CreateShader(vk::PipelineShaderStageCreateInfo &shadersOut, Slang::ComPtr &program, - ShaderInfo const &shaders); PipelineCreationError CreatePipelineLayout(vk::PipelineLayout &pipelineLayout, Slang::ComPtr const &program); public: // Pipelines, unlike the other resources, are not ref-counted. - PipelineCreationError CreatePipeline(Pipeline &pipeline, GraphicsPipelineCreateInfo const &createInfo); + PipelineCreationError CreateGraphicsPipeline(Pipeline &pipeline, GraphicsPipelineCreateInfo const &createInfo); PipelineCreationError CreateComputePipeline(Pipeline &pipeline, ComputePipelineCreateInfo const &createInfo); // diff --git a/aster/src/aster/systems/device.cpp b/aster/src/aster/systems/device.cpp index 6817659..e7003d2 100644 --- a/aster/src/aster/systems/device.cpp +++ b/aster/src/aster/systems/device.cpp @@ -502,7 +502,7 @@ systems::Device::CreateSampler(SamplerCreateInfo const &createInfo) // ---------------------------------------------------------------------------------------------------- systems::PipelineCreationError -systems::Device::CreatePipeline(Pipeline &pipelineOut, GraphicsPipelineCreateInfo const &createInfo) +systems::Device::CreateGraphicsPipeline(Pipeline &pipelineOut, GraphicsPipelineCreateInfo const &createInfo) { eastl::fixed_vector shaders; Slang::ComPtr program; diff --git a/samples/01_triangle/triangle.cpp b/samples/01_triangle/triangle.cpp index b5ca4cc..28d9aae 100644 --- a/samples/01_triangle/triangle.cpp +++ b/samples/01_triangle/triangle.cpp @@ -62,7 +62,7 @@ main(int, char **) }}; Pipeline pipeline; - auto pipelineError = device.CreatePipeline(pipeline, { + auto pipelineError = device.CreateGraphicsPipeline(pipeline, { .m_VertexInputs = {{ .m_Attribute = Vertex::GetAttributes(), .m_Stride = sizeof(Vertex), diff --git a/samples/02_box/box.cpp b/samples/02_box/box.cpp index 2f87ee8..dc915e5 100644 --- a/samples/02_box/box.cpp +++ b/samples/02_box/box.cpp @@ -127,7 +127,7 @@ main(int, char **) Pipeline pipeline; auto pipelineResult = - device.CreatePipeline(pipeline, {.m_Shaders = { + device.CreateGraphicsPipeline(pipeline, {.m_Shaders = { {.m_ShaderFile = SHADER_FILE, .m_EntryPoints = {"vsmain", "fsmain"}}, }}); ERROR_IF(pipelineResult, "Could not create pipeline. Cause: {}", pipelineResult.What()) diff --git a/samples/03_model_render/model_render.cpp b/samples/03_model_render/model_render.cpp index e58f097..3e59f97 100644 --- a/samples/03_model_render/model_render.cpp +++ b/samples/03_model_render/model_render.cpp @@ -184,7 +184,7 @@ main(int, char **) auto attachmentFormat = device.m_Swapchain.m_Format; Pipeline pipeline; - if (auto result = device.CreatePipeline(pipeline, { + if (auto result = device.CreateGraphicsPipeline(pipeline, { .m_Shaders = {{ .m_ShaderFile = MODEL_SHADER_FILE, .m_EntryPoints = {"vsmain", "fsmain"}, @@ -196,7 +196,7 @@ main(int, char **) } Pipeline backgroundPipeline; - if (auto result = device.CreatePipeline( + if (auto result = device.CreateGraphicsPipeline( backgroundPipeline, { .m_Shaders = {{ .m_ShaderFile = BACKGROUND_SHADER_FILE,