Skip to content

Commit 0afb15f

Browse files
committed
Update SetData usage in documents
1 parent b3e10e9 commit 0afb15f

File tree

3 files changed

+33
-33
lines changed

3 files changed

+33
-33
lines changed

Apps/02-HelloCube/README.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -203,10 +203,10 @@ class HelloTriangleApp final : public GraphicsApp
203203

204204
// Create index buffer for cube mesh
205205
m_index_buffer = GetRenderContext().CreateBuffer(Rhi::BufferSettings::ForIndexBuffer(m_cube_mesh.GetIndexDataSize(), GetIndexFormat(m_cube_mesh.GetIndex(0))));
206-
m_index_buffer.SetData(
207-
{ { reinterpret_cast<Data::ConstRawPtr>(m_cube_mesh.GetIndices().data()), m_cube_mesh.GetIndexDataSize() } },
208-
m_render_cmd_queue
209-
);
206+
m_index_buffer.SetData(m_render_cmd_queue, {
207+
reinterpret_cast<Data::ConstRawPtr>(m_cube_mesh.GetIndices().data()),
208+
m_cube_mesh.GetIndexDataSize()
209+
});
210210

211211
// Create per-frame command lists
212212
for(HelloCubeFrame& frame : GetFrames())
@@ -290,10 +290,10 @@ class HelloCubeApp final : public GraphicsApp
290290
const HelloCubeFrame& frame = GetCurrentFrame();
291291
292292
// Update vertex buffer with vertices in camera's projection view
293-
frame.vertex_buffer_set[0].SetData(
294-
{ { reinterpret_cast<Data::ConstRawPtr>(m_proj_vertices.data()), m_cube_mesh.GetVertexDataSize() } },
295-
m_render_cmd_queue
296-
);
293+
frame.vertex_buffer_set[0].SetData(m_render_cmd_queue, {
294+
reinterpret_cast<Data::ConstRawPtr>(m_proj_vertices.data()),
295+
m_cube_mesh.GetVertexDataSize()
296+
});
297297

298298
// Issue commands for cube rendering
299299
META_DEBUG_GROUP_VAR(s_debug_group, "Cube Rendering");
@@ -544,10 +544,10 @@ class HelloCubeApp final : public GraphicsApp
544544
545545
// Create constant vertex buffer
546546
Rhi::Buffer vertex_buffer = GetRenderContext().CreateBuffer(Rhi::BufferSettings::ForVertexBuffer(m_cube_mesh.GetVertexDataSize(), m_cube_mesh.GetVertexSize()));
547-
vertex_buffer.SetData(
548-
{ { reinterpret_cast<Data::ConstRawPtr>(m_cube_mesh.GetVertices().data()), m_cube_mesh.GetVertexDataSize() } },
549-
m_render_cmd_queue
550-
);
547+
vertex_buffer.SetData(m_render_cmd_queue, {
548+
reinterpret_cast<Data::ConstRawPtr>(m_cube_mesh.GetVertices().data()),
549+
m_cube_mesh.GetVertexDataSize()
550+
});
551551
m_vertex_buffer_set = Rhi::BufferSet(Rhi::BufferType::Vertex, { vertex_buffer });
552552
553553
const auto uniforms_data_size = static_cast<Data::Size>(sizeof(m_shader_uniforms));
@@ -601,7 +601,7 @@ class HelloCubeApp final : public GraphicsApp
601601
const HelloCubeFrame& frame = GetCurrentFrame();
602602

603603
// Update uniforms buffer on GPU and apply model-view-projection transformation in vertex shader on GPU
604-
frame.uniforms_buffer.SetData(m_shader_uniforms_subresources, m_render_cmd_queue);
604+
frame.uniforms_buffer.SetData(m_render_cmd_queue, m_shader_uniforms_subresources);
605605

606606
// Issue commands for cube rendering
607607
META_DEBUG_GROUP_VAR(s_debug_group, "Cube Rendering");

Apps/03-TexturedCube/README.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -232,28 +232,28 @@ void TexturedCubeApp::Init()
232232
const Data::Size vertex_data_size = cube_mesh.GetVertexDataSize();
233233
const Data::Size vertex_size = cube_mesh.GetVertexSize();
234234
rhi::Buffer vertex_buffer = GetRenderContext().CreateBuffer(rhi::BufferSettings::ForVertexBuffer(vertex_data_size, vertex_size));
235-
vertex_buffer.SetData(
236-
{ { reinterpret_cast<Data::ConstRawPtr>(cube_mesh.GetVertices().data()), vertex_data_size } },
237-
render_cmd_queue
238-
);
235+
vertex_buffer.SetData(render_cmd_queue, {
236+
reinterpret_cast<Data::ConstRawPtr>(cube_mesh.GetVertices().data()),
237+
vertex_data_size
238+
});
239239
m_vertex_buffer_set = rhi::BufferSet(rhi::BufferType::Vertex, { vertex_buffer });
240240

241241
// Create index buffer for cube mesh
242242
const Data::Size index_data_size = cube_mesh.GetIndexDataSize();
243243
const gfx::PixelFormat index_format = gfx::GetIndexFormat(cube_mesh.GetIndex(0));
244244
m_index_buffer = GetRenderContext().CreateBuffer(rhi::BufferSettings::ForIndexBuffer(index_data_size, index_format));
245-
m_index_buffer.SetData(
246-
{ { reinterpret_cast<Data::ConstRawPtr>(cube_mesh.GetIndices().data()), index_data_size } },
247-
render_cmd_queue
248-
);
245+
m_index_buffer.SetData(render_cmd_queue, {
246+
reinterpret_cast<Data::ConstRawPtr>(cube_mesh.GetIndices().data()),
247+
index_data_size
248+
});
249249

250250
// Create constants buffer for frame rendering
251251
const auto constants_data_size = static_cast<Data::Size>(sizeof(m_shader_constants));
252252
m_const_buffer = GetRenderContext().CreateBuffer(rhi::BufferSettings::ForConstantBuffer(constants_data_size));
253-
m_const_buffer.SetData(
254-
{ { reinterpret_cast<Data::ConstRawPtr>(&m_shader_constants), constants_data_size } },
255-
render_cmd_queue
256-
);
253+
m_const_buffer.SetData(render_cmd_queue, {
254+
reinterpret_cast<Data::ConstRawPtr>(&m_shader_constants),
255+
constants_data_size
256+
});
257257

258258
...
259259
}
@@ -449,7 +449,7 @@ bool TexturedCubeApp::Render()
449449
// Update uniforms buffer related to current frame
450450
const TexturedCubeFrame& frame = GetCurrentFrame();
451451
const rhi::CommandQueue& render_cmd_queue = GetRenderContext().GetRenderCommandKit().GetQueue();
452-
frame.uniforms_buffer.SetData(m_shader_uniforms_subresources, render_cmd_queue);
452+
frame.uniforms_buffer.SetData(render_cmd_queue, m_shader_uniforms_subresources);
453453

454454
// Issue commands for cube rendering
455455
META_DEBUG_GROUP_VAR(s_debug_group, "Cube Rendering");

Apps/04-ShadowCube/README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ struct MeshUniforms
6767
`TexturedMeshBuffers<UniformsType>` which is managing vertex, index, uniforms buffers and texture with data for particular
6868
mesh drawing passed to constructor as a reference to [BaseMesh<VType>]((../../../Modules/Graphics/Primitives/Include/Methane/Graphics/Mesh/BaseMesh.hpp)) object.
6969

70-
Supplementary member `m_scene_uniforms_subresources` stores a pointer to the `m_scene_uniforms` in the `std::vector`
70+
Supplementary member `m_scene_uniforms_subresource` stores a pointer to the `m_scene_uniforms` in the `std::vector`
7171
type `gfx::IResource::SubResources` which is passed to `Rhi::Buffer::SetData(...)` method to update the buffer data on GPU.
7272

7373
Two `gfx::Camera` objects are used: one `m_view_camera` is usual perspective view camera, while the other `m_light_camera`
@@ -149,7 +149,7 @@ private:
149149
30.F // - light_specular_factor
150150
};
151151
hlslpp::SceneUniforms m_scene_uniforms{ };
152-
rhi::SubResources m_scene_uniforms_subresources{
152+
rhi::SubResources m_scene_uniforms_subresource{
153153
{ reinterpret_cast<Data::ConstRawPtr>(&m_scene_uniforms), sizeof(hlslpp::SceneUniforms) } // NOSONAR
154154
};
155155
gfx::Camera m_view_camera;
@@ -577,11 +577,11 @@ bool ShadowCubeApp::Render()
577577
// Upload uniform buffers to GPU
578578
const ShadowCubeFrame& frame = GetCurrentFrame();
579579
const rhi::CommandQueue render_cmd_queue = GetRenderContext().GetRenderCommandKit().GetQueue();
580-
frame.scene_uniforms_buffer.SetData(m_scene_uniforms_subresources, render_cmd_queue);
581-
frame.shadow_pass.floor.uniforms_buffer.SetData(m_floor_buffers_ptr->GetShadowPassUniformsSubresources(), render_cmd_queue);
582-
frame.shadow_pass.cube.uniforms_buffer.SetData(m_cube_buffers_ptr->GetShadowPassUniformsSubresources(), render_cmd_queue);
583-
frame.final_pass.floor.uniforms_buffer.SetData(m_floor_buffers_ptr->GetFinalPassUniformsSubresources(), render_cmd_queue);
584-
frame.final_pass.cube.uniforms_buffer.SetData(m_cube_buffers_ptr->GetFinalPassUniformsSubresources(), render_cmd_queue);
580+
frame.scene_uniforms_buffer.SetData(render_cmd_queue, m_scene_uniforms_subresource);
581+
frame.shadow_pass.floor.uniforms_buffer.SetData(render_cmd_queue, m_floor_buffers_ptr->GetShadowPassUniformsSubresources());
582+
frame.shadow_pass.cube.uniforms_buffer.SetData(render_cmd_queue, m_cube_buffers_ptr->GetShadowPassUniformsSubresources());
583+
frame.final_pass.floor.uniforms_buffer.SetData(render_cmd_queue, m_floor_buffers_ptr->GetFinalPassUniformsSubresources());
584+
frame.final_pass.cube.uniforms_buffer.SetData(render_cmd_queue, m_cube_buffers_ptr->GetFinalPassUniformsSubresources());
585585

586586
// Record commands for shadow & final render passes
587587
RenderScene(m_shadow_pass, frame.shadow_pass);

0 commit comments

Comments
 (0)