Skip to content

Commit b8af483

Browse files
victorcodavictorcoda
committed
Updated Magma submodule
1 parent d830a59 commit b8af483

File tree

20 files changed

+122
-120
lines changed

20 files changed

+122
-120
lines changed

‎blur-gaussian/blur-gaussian.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,17 +106,17 @@ class GaussianBlur : public GraphicsApp
106106
FragmentStageBinding(1, StorageBuffer(1)),
107107
}));
108108
horzDescriptor.set = descriptorPool->allocateDescriptorSet(horzDescriptor.layout);
109-
horzDescriptor.set->update(0, inputFramebuffer->getColorView(), nearestRepeat);
110-
horzDescriptor.set->update(1, weightsBuffer);
109+
horzDescriptor.set->writeDescriptor(0, inputFramebuffer->getColorView(), nearestRepeat);
110+
horzDescriptor.set->writeDescriptor(1, weightsBuffer);
111111
// 2. Vertical pass
112112
vertDescriptor.layout = std::shared_ptr<magma::DescriptorSetLayout>(new magma::DescriptorSetLayout(device,
113113
{
114114
VertexFragmentStageBinding(0, CombinedImageSampler(1)),
115115
FragmentStageBinding(1, StorageBuffer(1)),
116116
}));
117117
vertDescriptor.set = descriptorPool->allocateDescriptorSet(vertDescriptor.layout);
118-
vertDescriptor.set->update(0, tempFramebuffer->getColorView(), nearestRepeat);
119-
vertDescriptor.set->update(1, weightsBuffer);
118+
vertDescriptor.set->writeDescriptor(0, tempFramebuffer->getColorView(), nearestRepeat);
119+
vertDescriptor.set->writeDescriptor(1, weightsBuffer);
120120
}
121121

122122
void setupGraphicsPipelines()

‎blur-ping-pong/blur-ping-pong.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ class PingPongBlur : public GraphicsApp
7171
magma::bindings::VertexFragmentStageBinding(0, magma::descriptors::CombinedImageSampler(1)));
7272
ping = createPass(layout, true);
7373
pong = createPass(layout, false);
74-
ping.set->update(0, pong.framebuffer->getColorView(), bilinearRepeat); // Use hardware bilinear filtering
75-
pong.set->update(0, ping.framebuffer->getColorView(), bilinearRepeat); // Use hardware bilinear filtering
74+
ping.set->writeDescriptor(0, pong.framebuffer->getColorView(), bilinearRepeat); // Use hardware bilinear filtering
75+
pong.set->writeDescriptor(0, ping.framebuffer->getColorView(), bilinearRepeat); // Use hardware bilinear filtering
7676
}
7777

7878
void setupGraphicsPipelines()

‎brdf/brdf.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -188,11 +188,11 @@ class BasicBrdf : public GraphicsApp
188188
FragmentStageBinding(4, CombinedImageSampler(1))
189189
}));
190190
descriptor.set = descriptorPool->allocateDescriptorSet(descriptor.layout);
191-
descriptor.set->update(0, transforms);
192-
descriptor.set->update(1, viewProjTransforms);
193-
descriptor.set->update(2, lightSource);
194-
descriptor.set->update(3, materials);
195-
descriptor.set->update(4, aniso, anisotropicClampToEdge);
191+
descriptor.set->writeDescriptor(0, transforms);
192+
descriptor.set->writeDescriptor(1, viewProjTransforms);
193+
descriptor.set->writeDescriptor(2, lightSource);
194+
descriptor.set->writeDescriptor(3, materials);
195+
descriptor.set->writeDescriptor(4, aniso, anisotropicClampToEdge);
196196
}
197197

198198
void setupGraphicsPipelines()

‎bumpmapping/bumpmapping.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -138,16 +138,16 @@ class BumpMapping : public GraphicsApp
138138
FragmentStageBinding(3, CombinedImageSampler(1))
139139
}));
140140
bumpDescriptor.set = descriptorPool->allocateDescriptorSet(bumpDescriptor.layout);
141-
bumpDescriptor.set->update(0, transforms);
142-
bumpDescriptor.set->update(1, viewProjTransforms);
143-
bumpDescriptor.set->update(2, lightSource);
144-
bumpDescriptor.set->update(3, heightMap, anisotropicClampToEdge);
141+
bumpDescriptor.set->writeDescriptor(0, transforms);
142+
bumpDescriptor.set->writeDescriptor(1, viewProjTransforms);
143+
bumpDescriptor.set->writeDescriptor(2, lightSource);
144+
bumpDescriptor.set->writeDescriptor(3, heightMap, anisotropicClampToEdge);
145145
// Fill shader
146146
fillDescriptor.layout = std::shared_ptr<magma::DescriptorSetLayout>(new magma::DescriptorSetLayout(device,
147147
VertexStageBinding(0, DynamicUniformBuffer(1))
148148
));
149149
fillDescriptor.set = descriptorPool->allocateDescriptorSet(fillDescriptor.layout);
150-
fillDescriptor.set->update(0, transforms);
150+
fillDescriptor.set->writeDescriptor(0, transforms);
151151
}
152152

153153
void setupGraphicsPipelines()

‎cook-torrance/cook-torrance.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -208,12 +208,12 @@ class CookTorrance : public GraphicsApp
208208
FragmentStageBinding(5, DynamicUniformBuffer(1))
209209
}));
210210
descriptor.set = descriptorPool->allocateDescriptorSet(descriptor.layout);
211-
descriptor.set->update(0, transforms);
212-
descriptor.set->update(1, viewProjTransforms);
213-
descriptor.set->update(2, lightSources);
214-
descriptor.set->update(3, roughnessUniform);
215-
descriptor.set->update(4, refractiveIndices);
216-
descriptor.set->update(5, albedoColors);
211+
descriptor.set->writeDescriptor(0, transforms);
212+
descriptor.set->writeDescriptor(1, viewProjTransforms);
213+
descriptor.set->writeDescriptor(2, lightSources);
214+
descriptor.set->writeDescriptor(3, roughnessUniform);
215+
descriptor.set->writeDescriptor(4, refractiveIndices);
216+
descriptor.set->writeDescriptor(5, albedoColors);
217217
}
218218

219219
void setupGraphicsPipeline()

‎debug-tangents/debug-tangents.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,13 +114,13 @@ class DebugTangents : public GraphicsApp
114114
FragmentStageBinding(1, UniformBuffer(1)),
115115
}));
116116
wireframeDescriptor.set = descriptorPool->allocateDescriptorSet(wireframeDescriptor.layout);
117-
wireframeDescriptor.set->update(0, transforms);
118-
wireframeDescriptor.set->update(1, wireframe);
117+
wireframeDescriptor.set->writeDescriptor(0, transforms);
118+
wireframeDescriptor.set->writeDescriptor(1, wireframe);
119119
// 2. Tangents pass
120120
transformDescriptor.layout = std::shared_ptr<magma::DescriptorSetLayout>(new magma::DescriptorSetLayout(device,
121121
VertexGeometryStageBinding(0, DynamicUniformBuffer(1))));
122122
transformDescriptor.set = descriptorPool->allocateDescriptorSet(transformDescriptor.layout);
123-
transformDescriptor.set->update(0, transforms);
123+
transformDescriptor.set->writeDescriptor(0, transforms);
124124
}
125125

126126
void setupGraphicsPipelines()

‎deferred-shading/deferred-shading.cpp

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -218,8 +218,8 @@ class DeferredShading : public GraphicsApp
218218
FragmentStageBinding(1, UniformBuffer(1))
219219
}));
220220
depthDescriptor.set = descriptorPool->allocateDescriptorSet(depthDescriptor.layout);
221-
depthDescriptor.set->update(0, transforms);
222-
depthDescriptor.set->update(1, viewProjTransforms);
221+
depthDescriptor.set->writeDescriptor(0, transforms);
222+
depthDescriptor.set->writeDescriptor(1, viewProjTransforms);
223223
// 2. G-buffer fill shader
224224
gbDescriptor.layout = std::shared_ptr<magma::DescriptorSetLayout>(new magma::DescriptorSetLayout(device,
225225
{
@@ -228,22 +228,22 @@ class DeferredShading : public GraphicsApp
228228
FragmentStageBinding(2, DynamicUniformBuffer(1))
229229
}));
230230
gbDescriptor.set = descriptorPool->allocateDescriptorSet(gbDescriptor.layout);
231-
gbDescriptor.set->update(0, transforms);
232-
gbDescriptor.set->update(1, viewProjTransforms);
233-
gbDescriptor.set->update(2, materials);
231+
gbDescriptor.set->writeDescriptor(0, transforms);
232+
gbDescriptor.set->writeDescriptor(1, viewProjTransforms);
233+
gbDescriptor.set->writeDescriptor(2, materials);
234234
// 3. G-buffer fill texture shader
235235
gbTexDescriptor.layout = std::shared_ptr<magma::DescriptorSetLayout>(new magma::DescriptorSetLayout(device,
236236
{
237-
VertexFragmentStageBinding(0, magma::descriptors::DynamicUniformBuffer(1)),
237+
VertexFragmentStageBinding(0, DynamicUniformBuffer(1)),
238238
FragmentStageBinding(1, UniformBuffer(1)),
239239
FragmentStageBinding(2, DynamicUniformBuffer(1)),
240240
FragmentStageBinding(3, CombinedImageSampler(1))
241241
}));
242242
gbTexDescriptor.set = descriptorPool->allocateDescriptorSet(gbTexDescriptor.layout);
243-
gbTexDescriptor.set->update(0, transforms);
244-
gbTexDescriptor.set->update(1, viewProjTransforms);
245-
gbTexDescriptor.set->update(2, materials);
246-
gbTexDescriptor.set->update(3, normalMap, anisotropicClampToEdge);
243+
gbTexDescriptor.set->writeDescriptor(0, transforms);
244+
gbTexDescriptor.set->writeDescriptor(1, viewProjTransforms);
245+
gbTexDescriptor.set->writeDescriptor(2, materials);
246+
gbTexDescriptor.set->writeDescriptor(3, normalMap, anisotropicClampToEdge);
247247
// 4. Deferred shading
248248
dsDescriptor.layout = std::shared_ptr<magma::DescriptorSetLayout>(new magma::DescriptorSetLayout(device,
249249
{
@@ -255,12 +255,12 @@ class DeferredShading : public GraphicsApp
255255
FragmentStageBinding(6, CombinedImageSampler(1)) // Depth
256256
}));
257257
dsDescriptor.set = descriptorPool->allocateDescriptorSet(dsDescriptor.layout);
258-
dsDescriptor.set->update(0, viewProjTransforms);
259-
dsDescriptor.set->update(1, lightSource);
260-
dsDescriptor.set->update(2, gbuffer->getAttachmentView(0), nearestClampToEdge);
261-
dsDescriptor.set->update(3, gbuffer->getAttachmentView(1), nearestClampToEdge);
262-
dsDescriptor.set->update(4, gbuffer->getAttachmentView(2), nearestClampToEdge);
263-
dsDescriptor.set->update(5, gbuffer->getDepthStencilView(), nearestClampToEdge);
258+
dsDescriptor.set->writeDescriptor(0, viewProjTransforms);
259+
dsDescriptor.set->writeDescriptor(1, lightSource);
260+
dsDescriptor.set->writeDescriptor(2, gbuffer->getAttachmentView(0), nearestClampToEdge);
261+
dsDescriptor.set->writeDescriptor(3, gbuffer->getAttachmentView(1), nearestClampToEdge);
262+
dsDescriptor.set->writeDescriptor(4, gbuffer->getAttachmentView(2), nearestClampToEdge);
263+
dsDescriptor.set->writeDescriptor(5, gbuffer->getDepthStencilView(), nearestClampToEdge);
264264
}
265265

266266
void setupGraphicsPipelines()

‎displacement-mapping/displacement-mapping.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -205,19 +205,19 @@ class DisplacementMapping : public GraphicsApp
205205
VertexFragmentStageBinding(5, CombinedImageSampler(1))
206206
}));
207207
displacementDescriptor.set = descriptorPool->allocateDescriptorSet(displacementDescriptor.layout);
208-
displacementDescriptor.set->update(0, transforms);
209-
displacementDescriptor.set->update(1, viewProjTransforms);
210-
displacementDescriptor.set->update(2, lightSource);
211-
displacementDescriptor.set->update(3, material);
212-
displacementDescriptor.set->update(4, parameters);
213-
displacementDescriptor.set->update(5, displacementMap, anisotropicClampToEdge);
208+
displacementDescriptor.set->writeDescriptor(0, transforms);
209+
displacementDescriptor.set->writeDescriptor(1, viewProjTransforms);
210+
displacementDescriptor.set->writeDescriptor(2, lightSource);
211+
displacementDescriptor.set->writeDescriptor(3, material);
212+
displacementDescriptor.set->writeDescriptor(4, parameters);
213+
displacementDescriptor.set->writeDescriptor(5, displacementMap, anisotropicClampToEdge);
214214
// Fill shader
215215
fillDescriptor.layout = std::shared_ptr<magma::DescriptorSetLayout>(new magma::DescriptorSetLayout(device,
216216
{
217217
VertexStageBinding(0, DynamicUniformBuffer(1))
218218
}));
219219
fillDescriptor.set = descriptorPool->allocateDescriptorSet(fillDescriptor.layout);
220-
fillDescriptor.set->update(0, transforms);
220+
fillDescriptor.set->writeDescriptor(0, transforms);
221221
}
222222

223223
void setupGraphicsPipelines()

‎edge-detection/edge-detection.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ class EdgeDetection : public GraphicsApp
113113
descriptor.layout = std::shared_ptr<magma::DescriptorSetLayout>(new magma::DescriptorSetLayout(device,
114114
VertexStageBinding(0, DynamicUniformBuffer(1))));
115115
descriptor.set = descriptorPool->allocateDescriptorSet(descriptor.layout);
116-
descriptor.set->update(0, transforms);
116+
descriptor.set->writeDescriptor(0, transforms);
117117
}
118118

119119
void setupGraphicsPipelines()

‎gbuffer/gbuffer.cpp

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -183,30 +183,33 @@ class Gbuffer : public GraphicsApp
183183
}
184184

185185
void setupDescriptorSets()
186-
{ // 1. G-buffer fill shader
186+
{
187+
using namespace magma::bindings;
188+
using namespace magma::descriptors;
189+
// 1. G-buffer fill shader
187190
descriptor.layout = std::shared_ptr<magma::DescriptorSetLayout>(new magma::DescriptorSetLayout(device,
188191
{
189-
magma::bindings::VertexStageBinding(0, magma::descriptors::DynamicUniformBuffer(1)),
190-
magma::bindings::FragmentStageBinding(1, magma::descriptors::UniformBuffer(1)),
191-
magma::bindings::FragmentStageBinding(2, magma::descriptors::DynamicUniformBuffer(1)),
192+
VertexStageBinding(0, DynamicUniformBuffer(1)),
193+
VertexFragmentStageBinding(1, UniformBuffer(1)),
194+
VertexFragmentStageBinding(2, DynamicUniformBuffer(1)),
192195
}));
193196
descriptor.set = descriptorPool->allocateDescriptorSet(descriptor.layout);
194-
descriptor.set->update(0, transforms);
195-
descriptor.set->update(1, viewProjTransforms);
196-
descriptor.set->update(2, materials);
197+
descriptor.set->writeDescriptor(0, transforms);
198+
descriptor.set->writeDescriptor(1, viewProjTransforms);
199+
descriptor.set->writeDescriptor(2, materials);
197200
// 2. G-buffer fill texture shader
198201
texDescriptor.layout = std::shared_ptr<magma::DescriptorSetLayout>(new magma::DescriptorSetLayout(device,
199202
{
200-
magma::bindings::VertexFragmentStageBinding(0, magma::descriptors::DynamicUniformBuffer(1)),
201-
magma::bindings::FragmentStageBinding(1, magma::descriptors::UniformBuffer(1)),
202-
magma::bindings::FragmentStageBinding(2, magma::descriptors::DynamicUniformBuffer(1)),
203-
magma::bindings::FragmentStageBinding(3, magma::descriptors::CombinedImageSampler(1))
203+
magma::bindings::VertexFragmentStageBinding(0, DynamicUniformBuffer(1)),
204+
magma::bindings::VertexFragmentStageBinding(1, UniformBuffer(1)),
205+
magma::bindings::VertexFragmentStageBinding(2, DynamicUniformBuffer(1)),
206+
magma::bindings::VertexFragmentStageBinding(3, CombinedImageSampler(1))
204207
}));
205208
texDescriptor.set = descriptorPool->allocateDescriptorSet(texDescriptor.layout);
206-
texDescriptor.set->update(0, transforms);
207-
texDescriptor.set->update(1, viewProjTransforms);
208-
texDescriptor.set->update(2, materials);
209-
texDescriptor.set->update(3, normalMap, anisotropicClampToEdge);
209+
texDescriptor.set->writeDescriptor(0, transforms);
210+
texDescriptor.set->writeDescriptor(1, viewProjTransforms);
211+
texDescriptor.set->writeDescriptor(2, materials);
212+
texDescriptor.set->writeDescriptor(3, normalMap, anisotropicClampToEdge);
210213
}
211214

212215
void setupGraphicsPipelines()

0 commit comments

Comments
 (0)