yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2025-03-06 09:31:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

vk: reuse index buffer for model shadow

Browse source
This commit is contained in:
Denis Pauk 2024-08-04 16:37:46 +03:00
parent 7ab6341e5b
commit 409b5bcd20
1 changed files with 22 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
src/client/refresh/vk/vk_mesh.c
View file

@ -299,7 +299,8 @@ static void
Vk_DrawAliasFrameLerp(entity_t *currententity, dmdx_t *paliashdr, float backlerp, image_t *skin, Vk_DrawAliasFrameLerp(entity_t *currententity, dmdx_t *paliashdr, float backlerp, image_t *skin,
int leftHandOffset, int translucentIdx, vec4_t *s_lerped, int leftHandOffset, int translucentIdx, vec4_t *s_lerped,
const float *shadelight, const float *shadevector, const float *shadelight, const float *shadevector,
uint32_t uboOffset, VkDescriptorSet uboDescriptorSet) uint32_t uboOffset, VkDescriptorSet uboDescriptorSet,
int *index_pos, VkBuffer **buffer, VkDeviceSize *dstOffset)
{ {
daliasxframe_t *frame, *oldframe; daliasxframe_t *frame, *oldframe;
dxtrivertx_t *ov, *verts; dxtrivertx_t *ov, *verts;
@ -311,7 +312,9 @@ Vk_DrawAliasFrameLerp(entity_t *currententity, dmdx_t *paliashdr, float backlerp
int i; int i;
int num_mesh_nodes; int num_mesh_nodes;
dmdxmesh_t *mesh_nodes; dmdxmesh_t *mesh_nodes;
int vertIdx = 0, index_pos = 0, firstVertex = 0; int vertIdx = 0, firstVertex = 0;
VkDeviceSize vboOffset, vaoSize;
VkBuffer vbo;
qboolean colorOnly = 0 != (currententity->flags & qboolean colorOnly = 0 != (currententity->flags &
(RF_SHELL_RED | RF_SHELL_GREEN | RF_SHELL_BLUE | RF_SHELL_DOUBLE | (RF_SHELL_RED | RF_SHELL_GREEN | RF_SHELL_BLUE | RF_SHELL_DOUBLE |
RF_SHELL_HALF_DAM)); RF_SHELL_HALF_DAM));
@ -386,13 +389,10 @@ Vk_DrawAliasFrameLerp(entity_t *currententity, dmdx_t *paliashdr, float backlerp
mesh_nodes[i].ofs_glcmds + mesh_nodes[i].num_glcmds), mesh_nodes[i].ofs_glcmds + mesh_nodes[i].num_glcmds),
alpha, verts, s_lerped, shadelight, shadevector, alpha, verts, s_lerped, shadelight, shadevector,
currententity->flags & (RF_SHELL_RED | RF_SHELL_GREEN | RF_SHELL_BLUE), currententity->flags & (RF_SHELL_RED | RF_SHELL_GREEN | RF_SHELL_BLUE),
&vertIdx, &firstVertex, &index_pos); &vertIdx, &firstVertex, index_pos);
} }
VkDeviceSize vaoSize = sizeof(modelvert) * vertIdx; vaoSize = sizeof(modelvert) * vertIdx;
VkBuffer vbo, *buffer;
VkDeviceSize vboOffset, dstOffset;
uint8_t *vertData = QVk_GetVertexBuffer(vaoSize, &vbo, &vboOffset); uint8_t *vertData = QVk_GetVertexBuffer(vaoSize, &vbo, &vboOffset);
memcpy(vertData, vertList, vaoSize); memcpy(vertData, vertList, vaoSize);
@ -402,20 +402,20 @@ Vk_DrawAliasFrameLerp(entity_t *currententity, dmdx_t *paliashdr, float backlerp
descriptorSets, 1, &uboOffset); descriptorSets, 1, &uboOffset);
vkCmdBindVertexBuffers(vk_activeCmdbuffer, 0, 1, &vbo, &vboOffset); vkCmdBindVertexBuffers(vk_activeCmdbuffer, 0, 1, &vbo, &vboOffset);
buffer = UpdateIndexBuffer(vertIdxData, verts_count * sizeof(uint16_t), &dstOffset); *buffer = UpdateIndexBuffer(vertIdxData, verts_count * sizeof(uint16_t), dstOffset);
vkCmdBindIndexBuffer(vk_activeCmdbuffer, *buffer, dstOffset, VK_INDEX_TYPE_UINT16); vkCmdBindIndexBuffer(vk_activeCmdbuffer, **buffer, *dstOffset, VK_INDEX_TYPE_UINT16);
vkCmdDrawIndexed(vk_activeCmdbuffer, index_pos, 1, 0, 0, 0); vkCmdDrawIndexed(vk_activeCmdbuffer, *index_pos, 1, 0, 0, 0);
} }
static void static void
Vk_DrawAliasShadow(int *order, int *order_end, float height, float lheight, Vk_DrawAliasShadow(int *order, int *order_end, float height, float lheight,
vec4_t *s_lerped, const float *shadevector, vec4_t *s_lerped, const float *shadevector,
int *vertIdx, int *firstVertex, int *index_pos) int *vertIdx)
{ {
while (1) while (1)
{ {
int count, vertexCount; int count;
/* get the vertex count and primitive type */ /* get the vertex count and primitive type */
count = *order++; count = *order++;
@ -428,14 +428,7 @@ Vk_DrawAliasShadow(int *order, int *order_end, float height, float lheight,
if (count < 0) if (count < 0)
{ {
count = -count; count = -count;
pipelineIdx = TRIANGLE_FAN;
} }
else
{
pipelineIdx = TRIANGLE_STRIP;
}
vertexCount = count;
do do
{ {
@ -469,21 +462,6 @@ Vk_DrawAliasShadow(int *order, int *order_end, float height, float lheight,
order += 3; order += 3;
} }
while (--count); while (--count);
if (pipelineIdx == TRIANGLE_STRIP)
{
GenStripIndexes(vertIdxData + *index_pos,
*firstVertex,
vertexCount - 2 + *firstVertex);
}
else
{
GenFanIndexes(vertIdxData + *index_pos,
*firstVertex,
vertexCount - 2 + *firstVertex);
}
*index_pos += (vertexCount - 2) * 3;
*firstVertex = *vertIdx;
} }
} }
@ -521,7 +499,7 @@ R_CullAliasModel(const model_t *currentmodel, vec3_t bbox[8], entity_t *e)
void void
R_DrawAliasModel(entity_t *currententity, const model_t *currentmodel) R_DrawAliasModel(entity_t *currententity, const model_t *currentmodel)
{ {
int leftHandOffset = 0, i; int leftHandOffset = 0, index_pos = 0, i;
float prev_viewproj[16], an; float prev_viewproj[16], an;
vec3_t shadevector, shadelight; vec3_t shadevector, shadelight;
dmdx_t *paliashdr; dmdx_t *paliashdr;
@ -746,6 +724,8 @@ R_DrawAliasModel(entity_t *currententity, const model_t *currentmodel)
VkDescriptorSet uboDescriptorSet; VkDescriptorSet uboDescriptorSet;
uint8_t *uboData = QVk_GetUniformBuffer(sizeof(meshUbo), &uboOffset, &uboDescriptorSet); uint8_t *uboData = QVk_GetUniformBuffer(sizeof(meshUbo), &uboOffset, &uboDescriptorSet);
memcpy(uboData, &meshUbo, sizeof(meshUbo)); memcpy(uboData, &meshUbo, sizeof(meshUbo));
VkBuffer *buffer;
VkDeviceSize dstOffset;
/* draw model */ /* draw model */
{ {
@ -800,7 +780,8 @@ R_DrawAliasModel(entity_t *currententity, const model_t *currentmodel)
Vk_DrawAliasFrameLerp(currententity, paliashdr, currententity->backlerp, Vk_DrawAliasFrameLerp(currententity, paliashdr, currententity->backlerp,
skin, leftHandOffset, (currententity->flags & RF_TRANSLUCENT) ? 1 : 0, skin, leftHandOffset, (currententity->flags & RF_TRANSLUCENT) ? 1 : 0,
s_lerped, shadelight, shadevector, uboOffset, uboDescriptorSet); s_lerped, shadelight, shadevector, uboOffset, uboDescriptorSet,
&index_pos, &buffer, &dstOffset);
} }
if ( ( currententity->flags & RF_WEAPONMODEL ) && ( r_lefthand->value == 1.0F ) ) if ( ( currententity->flags & RF_WEAPONMODEL ) && ( r_lefthand->value == 1.0F ) )
@ -821,7 +802,9 @@ R_DrawAliasModel(entity_t *currententity, const model_t *currentmodel)
dmdxmesh_t *mesh_nodes; dmdxmesh_t *mesh_nodes;
float height, lheight; float height, lheight;
int *order; int *order;
int vertIdx = 0, index_pos = 0, firstVertex = 0; int vertIdx = 0;
VkDeviceSize vboOffset, vaoSize;
VkBuffer vbo;
order = (int *)((byte *)paliashdr + paliashdr->ofs_glcmds); order = (int *)((byte *)paliashdr + paliashdr->ofs_glcmds);
@ -838,12 +821,10 @@ R_DrawAliasModel(entity_t *currententity, const model_t *currentmodel)
order + Q_min(paliashdr->num_glcmds, order + Q_min(paliashdr->num_glcmds,
mesh_nodes[i].ofs_glcmds + mesh_nodes[i].num_glcmds), mesh_nodes[i].ofs_glcmds + mesh_nodes[i].num_glcmds),
height, lheight, s_lerped, shadevector, height, lheight, s_lerped, shadevector,
&vertIdx, &firstVertex, &index_pos); &vertIdx);
} }
VkDeviceSize vaoSize = sizeof(vec3_t) * vertIdx; vaoSize = sizeof(vec3_t) * vertIdx;
VkBuffer vbo, *buffer;
VkDeviceSize vboOffset, dstOffset;
uint8_t *vertData = QVk_GetVertexBuffer(vaoSize, &vbo, &vboOffset); uint8_t *vertData = QVk_GetVertexBuffer(vaoSize, &vbo, &vboOffset);
memcpy(vertData, shadowverts, vaoSize); memcpy(vertData, shadowverts, vaoSize);
@ -853,7 +834,6 @@ R_DrawAliasModel(entity_t *currententity, const model_t *currentmodel)
vk_shadowsPipelineFan.layout, 0, 1, &uboDescriptorSet, 1, &uboOffset); vk_shadowsPipelineFan.layout, 0, 1, &uboDescriptorSet, 1, &uboOffset);
vkCmdBindVertexBuffers(vk_activeCmdbuffer, 0, 1, &vbo, &vboOffset); vkCmdBindVertexBuffers(vk_activeCmdbuffer, 0, 1, &vbo, &vboOffset);
buffer = UpdateIndexBuffer(vertIdxData, verts_count * sizeof(uint16_t), &dstOffset);
vkCmdBindIndexBuffer(vk_activeCmdbuffer, *buffer, dstOffset, VK_INDEX_TYPE_UINT16); vkCmdBindIndexBuffer(vk_activeCmdbuffer, *buffer, dstOffset, VK_INDEX_TYPE_UINT16);
vkCmdDrawIndexed(vk_activeCmdbuffer, index_pos, 1, 0, 0, 0); vkCmdDrawIndexed(vk_activeCmdbuffer, index_pos, 1, 0, 0, 0);
} }