Skip to content

Commit f346350

Browse files
committed
fixup: Fix two CI issues
Pass offsets correctly.
1 parent a0997fa commit f346350

2 files changed

Lines changed: 10 additions & 8 deletions

File tree

code/graphics/vulkan/VulkanDraw.cpp

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,7 @@ void VulkanDrawManager::renderPrimitivesParticle(particle_material* material_inf
561561

562562
void VulkanDrawManager::renderPrimitivesDistortion(distortion_material* material_info,
563563
primitive_type prim_type, vertex_layout* layout,
564-
int n_verts, gr_buffer_handle buffer_handle)
564+
int offset, int n_verts, gr_buffer_handle buffer_handle)
565565
{
566566
if (!material_info || !layout || n_verts <= 0) {
567567
return;
@@ -571,11 +571,12 @@ void VulkanDrawManager::renderPrimitivesDistortion(distortion_material* material
571571
return;
572572
}
573573
bindVertexBuffer(buffer_handle, 0);
574-
draw(prim_type, 0, n_verts);
574+
draw(prim_type, offset, n_verts);
575575
}
576576

577577
void VulkanDrawManager::renderMovie(movie_material* material_info, primitive_type prim_type,
578-
vertex_layout* layout, int n_verts, gr_buffer_handle buffer_handle)
578+
vertex_layout* layout, int n_verts, gr_buffer_handle buffer_handle,
579+
size_t buffer_offset)
579580
{
580581
if (!material_info || !layout || n_verts <= 0) {
581582
return;
@@ -586,7 +587,7 @@ void VulkanDrawManager::renderMovie(movie_material* material_info, primitive_typ
586587
if (!applyMaterial(material_info, prim_type, layout)) {
587588
return;
588589
}
589-
bindVertexBuffer(buffer_handle, 0);
590+
bindVertexBuffer(buffer_handle, buffer_offset);
590591
draw(prim_type, 0, n_verts);
591592
}
592593

@@ -1936,7 +1937,7 @@ void vulkan_render_primitives_distortion(distortion_material* material_info,
19361937
pp->getDistortionTextureView(), pp->getDistortionSampler());
19371938
}
19381939

1939-
drawManager->renderPrimitivesDistortion(material_info, prim_type, layout, n_verts, buffer_handle);
1940+
drawManager->renderPrimitivesDistortion(material_info, prim_type, layout, offset, n_verts, buffer_handle);
19401941

19411942
// Clear overrides so subsequent draws use fallback textures
19421943
drawManager->clearDistortionOverrides();
@@ -1953,7 +1954,7 @@ void vulkan_render_movie(movie_material* material_info,
19531954
vulkan_set_default_material_uniforms(material_info);
19541955

19551956
auto* drawManager = getDrawManager();
1956-
drawManager->renderMovie(material_info, prim_type, layout, n_verts, buffer);
1957+
drawManager->renderMovie(material_info, prim_type, layout, n_verts, buffer, buffer_offset);
19571958
}
19581959

19591960
void vulkan_render_nanovg(nanovg_material* material_info,

code/graphics/vulkan/VulkanDraw.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,13 +142,14 @@ class VulkanDrawManager {
142142
*/
143143
void renderPrimitivesDistortion(distortion_material* material_info,
144144
primitive_type prim_type, vertex_layout* layout,
145-
int n_verts, gr_buffer_handle buffer_handle);
145+
int offset, int n_verts, gr_buffer_handle buffer_handle);
146146

147147
/**
148148
* @brief Render movie frame
149149
*/
150150
void renderMovie(movie_material* material_info, primitive_type prim_type,
151-
vertex_layout* layout, int n_verts, gr_buffer_handle buffer_handle);
151+
vertex_layout* layout, int n_verts, gr_buffer_handle buffer_handle,
152+
size_t buffer_offset);
152153

153154
/**
154155
* @brief Render NanoVG UI

0 commit comments

Comments
 (0)