From 7dba118b56c2858688a887389dfde8933e916e70 Mon Sep 17 00:00:00 2001
From: Lava Block <the@lava-block.com>
Date: Thu, 20 May 2021 12:46:53 +0200
Subject: [PATCH] rename pipeline_layout -> add_descriptor and
add_push_constant_range
---
liblava-demo/lamp.cpp | 2 +-
liblava-demo/light.cpp | 2 +-
liblava/block/pipeline.hpp | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/liblava-demo/lamp.cpp b/liblava-demo/lamp.cpp
index 5d77156c..e75bf46d 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 c1eca57e..e3dc9902 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 0165681f..887404bd 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);
}
--
GitLab