yquake2
/
yquake2remaster
mirror of https://github.com/yquake2/yquake2remaster.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

vk: use vkCmdDrawIndexed in EmitWaterPolys

This commit is contained in:
Denis Pauk 2024-08-07 00:03:06 +03:00
parent dca42e0a04
commit 32d2a465d4
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/client/refresh/vk/vk_warp.c
View File

@ -60,6 +60,9 @@ EmitWaterPolys(msurface_t *fa, image_t *texture, const float *modelMatrix,
float tscroll; float tscroll;
} polyUbo; } polyUbo;
VkBuffer *buffer;
VkDeviceSize dstOffset;
polyUbo.color[0] = color[0]; polyUbo.color[0] = color[0];
polyUbo.color[1] = color[1]; polyUbo.color[1] = color[1];
polyUbo.color[2] = color[2]; polyUbo.color[2] = color[2];
@ -101,6 +104,7 @@ EmitWaterPolys(msurface_t *fa, image_t *texture, const float *modelMatrix,
texture->vk_texture.descriptorSet, texture->vk_texture.descriptorSet,
uboDescriptorSet uboDescriptorSet
}; };
int pos_vect = 0, index_pos = 0;
float gamma = 2.1F - vid_gamma->value; float gamma = 2.1F - vid_gamma->value;
@ -126,31 +130,32 @@ EmitWaterPolys(msurface_t *fa, image_t *texture, const float *modelMatrix,
for (bp = fa->polys; bp; bp = bp->next) for (bp = fa->polys; bp; bp = bp->next)
{ {
VkDeviceSize fanOffset;
VkBuffer fan;
p = bp; p = bp;
if (Mesh_VertsRealloc(p->numverts)) if (Mesh_VertsRealloc(pos_vect + p->numverts))
{ {
Com_Error(ERR_FATAL, "%s: can't allocate memory", __func__); Com_Error(ERR_FATAL, "%s: can't allocate memory", __func__);
} }
memcpy(verts_buffer, p->verts, sizeof(mvtx_t) * p->numverts); memcpy(verts_buffer + pos_vect, p->verts, sizeof(mvtx_t) * p->numverts);
for (i = 0; i < p->numverts; i++) for (i = 0; i < p->numverts; i++)
{ {
verts_buffer[i].texCoord[0] /= 64.f; verts_buffer[i + pos_vect].texCoord[0] /= 64.f;
verts_buffer[i].texCoord[1] /= 64.f; verts_buffer[i + pos_vect].texCoord[1] /= 64.f;
} }
GenFanIndexes(vertIdxData + index_pos,
uint8_t *vertData = QVk_GetVertexBuffer(sizeof(mvtx_t) * p->numverts, &vbo, &vboOffset); pos_vect, p->numverts - 2 + pos_vect);
memcpy(vertData, verts_buffer, sizeof(mvtx_t) * p->numverts); pos_vect += p->numverts;
index_pos += (p->numverts - 2) * 3;
fan = QVk_GetTriangleFanIbo((p->numverts - 2) * 3, &fanOffset);
vkCmdBindVertexBuffers(vk_activeCmdbuffer, 0, 1, &vbo, &vboOffset);
vkCmdBindIndexBuffer(vk_activeCmdbuffer, fan, fanOffset, VK_INDEX_TYPE_UINT16);
vkCmdDrawIndexed(vk_activeCmdbuffer, (p->numverts - 2) * 3, 1, 0, 0, 0);
} }
uint8_t *vertData = QVk_GetVertexBuffer(sizeof(mvtx_t) * pos_vect, &vbo, &vboOffset);
memcpy(vertData, verts_buffer, sizeof(mvtx_t) * pos_vect);
buffer = UpdateIndexBuffer(vertIdxData, index_pos * sizeof(uint16_t), &dstOffset);
vkCmdBindVertexBuffers(vk_activeCmdbuffer, 0, 1, &vbo, &vboOffset);
vkCmdBindIndexBuffer(vk_activeCmdbuffer, *buffer, dstOffset, VK_INDEX_TYPE_UINT16);
vkCmdDrawIndexed(vk_activeCmdbuffer, index_pos, 1, 0, 0, 0);
} }
void void