Skip to content

Commit f3137fd

Browse files
committed
dynamic buffers updates
1 parent 5348e86 commit f3137fd

File tree

6 files changed

+27
-41
lines changed

6 files changed

+27
-41
lines changed

.idea/workspace.xml

Lines changed: 19 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

imgui.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Size=400,400
44
Collapsed=0
55

66
[Window][Dear ImGui Demo]
7-
Pos=650,20
7+
Pos=576,117
88
Size=550,680
99
Collapsed=0
1010

src/Engine/DescriptorCache.hpp

Lines changed: 5 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111

1212

13+
1314
#ifndef DESCRIPTORCACHE_HPP
1415
#define DESCRIPTORCACHE_HPP
1516
namespace ENGINE
@@ -234,25 +235,10 @@ namespace ENGINE
234235
ShaderResource& binding = bufferBindingsKeys.at(name);
235236
Buffer* bufferRef = GetBufferByName(name);
236237
if (bufferRef==nullptr){return;}
237-
vk::BufferUsageFlags usageFlags;
238-
if (binding.type == vk::DescriptorType::eUniformBuffer)
239-
{
240-
usageFlags = vk::BufferUsageFlagBits::eUniformBuffer;
241-
}
242-
else if (binding.type == vk::DescriptorType::eStorageBuffer)
243-
{
244-
usageFlags = vk::BufferUsageFlagBits::eStorageBuffer;
245-
}else
246-
{
247-
assert(false && "unusported buffer type");
248-
}
249-
250238
buffersResources.at(binding.binding) = resourcesManagerRef->SetBuffer(
251239
name,
252-
usageFlags,
253-
vk::MemoryPropertyFlagBits::eHostVisible |
254-
vk::MemoryPropertyFlagBits::eHostCoherent,
255-
sizeof(T) * bufferData.size(), bufferData.data());
240+
sizeof(T) * bufferData.size(),
241+
bufferData.data());
256242

257243
}
258244

@@ -262,25 +248,10 @@ namespace ENGINE
262248
ShaderResource& binding = bufferBindingsKeys.at(name);
263249
Buffer* bufferRef = GetBufferByName(name);
264250
if (bufferRef==nullptr){return;}
265-
266-
vk::BufferUsageFlags usageFlags;
267-
if (binding.type == vk::DescriptorType::eUniformBuffer)
268-
{
269-
usageFlags = vk::BufferUsageFlagBits::eUniformBuffer;
270-
}
271-
else if (binding.type == vk::DescriptorType::eStorageBuffer)
272-
{
273-
usageFlags = vk::BufferUsageFlagBits::eStorageBuffer;
274-
}else
275-
{
276-
assert(false && "unsupported buffer type");
277-
}
278251
buffersResources.at(binding.binding) = resourcesManagerRef->SetBuffer(
279252
name,
280-
usageFlags,
281-
vk::MemoryPropertyFlagBits::eHostVisible |
282-
vk::MemoryPropertyFlagBits::eHostCoherent,
283-
sizeof(T), &bufferData);
253+
sizeof(T),
254+
&bufferData);
284255
}
285256
void SetSampler(std::string name, ImageView* imageView, Sampler* sampler = nullptr)
286257
{

src/Engine/ResourcesManager.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,7 @@ namespace ENGINE
164164
return stagedBuffers.back().get();
165165
}
166166

167-
Buffer* SetBuffer(std::string name, vk::BufferUsageFlags bufferUsageFlags,
168-
vk::MemoryPropertyFlags memPropertyFlags, vk::DeviceSize deviceSize
167+
Buffer* SetBuffer(std::string name, vk::DeviceSize deviceSize
169168
, void* data = nullptr)
170169
{
171170
assert(core!= nullptr &&"core must be set");

src/Shaders/glsl/Examples/fSample.frag

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@ void main() {
2727
vec4 textureArr = texture(textures[0], textCoord);
2828
vec4 storageArr = imageLoad(storagesImgs[0], coord);
2929

30-
outColor = textureArr;
30+
outColor = computeImage;
3131
}
0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)