diff --git a/liblava-demo/lamp.cpp b/liblava-demo/lamp.cpp index 5d77156c3acb535373732418acfd13425ab07b16..e75bf46dd345dae0ab0286d1fb3a8b1acea666b0 100644 --- a/liblava-demo/lamp.cpp +++ b/liblava-demo/lamp.cpp @@ -35,7 +35,7 @@ int main(int argc, char* argv[]) { pipeline->set_rasterization_front_face(VK_FRONT_FACE_COUNTER_CLOCKWISE); layout = make_pipeline_layout(); - layout->add_range({ VK_SHADER_STAGE_FRAGMENT_BIT, 0, sizeof(r32) * 8 }); + layout->add_push_constant_range({ VK_SHADER_STAGE_FRAGMENT_BIT, 0, sizeof(r32) * 8 }); if (!layout->create(app.device)) return false; diff --git a/liblava-demo/light.cpp b/liblava-demo/light.cpp index c1eca57ee1b8c91e801cb09eabe6a00b1708f299..e3dc9902d5eea81175286a35cbab99975fe5468e 100644 --- a/liblava-demo/light.cpp +++ b/liblava-demo/light.cpp @@ -153,7 +153,7 @@ int main(int argc, char* argv[]) { app.device->vkUpdateDescriptorSets(gbuffer_write_sets.size(), gbuffer_write_sets.data()); gbuffer_pipeline_layout->add(gbuffer_set_layout); - gbuffer_pipeline_layout->add_range({ VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_FRAGMENT_BIT, 0, sizeof(glsl::PushConstantData) }); + gbuffer_pipeline_layout->add_push_constant_range({ VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_FRAGMENT_BIT, 0, sizeof(glsl::PushConstantData) }); if (!gbuffer_pipeline_layout->create(app.device)) return false; diff --git a/liblava/block/pipeline.hpp b/liblava/block/pipeline.hpp index 0165681f0260fb3de57a3cb9ba14f526ed0190ca..887404bd8406e169383f941ec219394ad59d0e2e 100644 --- a/liblava/block/pipeline.hpp +++ b/liblava/block/pipeline.hpp @@ -21,10 +21,10 @@ namespace lava { push_constant_ranges.push_back(range); } - void add_layout(descriptor::ptr const& layout) { - add(layout); + void add_descriptor(descriptor::ptr const& descriptor) { + add(descriptor); } - void add_range(VkPushConstantRange const& range) { + void add_push_constant_range(VkPushConstantRange const& range) { add(range); }