qf
/
quakeforge
mirror of https://git.code.sf.net/p/quake/quakeforge
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[vulkan] Fix a typo and gcc purity warning

This commit is contained in:
Bill Currie 2021-12-13 10:39:01 +09:00
parent fde47d6983
commit d857bdea77
5 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/QF/Vulkan/qf_matrices.h
View File

@ -82,6 +82,7 @@ void Vulkan_Matrix_Init (struct vulkan_ctx_s *ctx);
void Vulkan_Matrix_Shutdown (struct vulkan_ctx_s *ctx); void Vulkan_Matrix_Shutdown (struct vulkan_ctx_s *ctx);
// "Draw" :) // "Draw" :)
void Vulkan_Matrix_Draw (struct qfv_renderframe_s *rFrame); void Vulkan_Matrix_Draw (struct qfv_renderframe_s *rFrame);
VkDescriptorSet Vulkan_Matrix_Descrptors (struct vulkan_ctx_s *ctx, int frame); VkDescriptorSet Vulkan_Matrix_Descriptors (struct vulkan_ctx_s *ctx, int frame)
__attribute__((pure));
#endif//__QF_Vulkan_qf_matrices_h #endif//__QF_Vulkan_qf_matrices_h

2
libs/video/renderer/vulkan/vulkan_alias.c
View File

@ -204,7 +204,7 @@ alias_begin_subpass (QFV_AliasSubpass subpass, VkPipeline pipeline,
dfunc->vkCmdBindPipeline (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS, pipeline); dfunc->vkCmdBindPipeline (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS, pipeline);
VkDescriptorSet sets[] = { VkDescriptorSet sets[] = {
Vulkan_Matrix_Descrptors (ctx, ctx->curFrame), Vulkan_Matrix_Descriptors (ctx, ctx->curFrame),
actx->descriptors, actx->descriptors,
}; };
dfunc->vkCmdBindDescriptorSets (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS, dfunc->vkCmdBindDescriptorSets (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,

2
libs/video/renderer/vulkan/vulkan_bsp.c
View File

@ -891,7 +891,7 @@ bsp_begin_subpass (QFV_BspSubpass subpass, VkPipeline pipeline,
VK_INDEX_TYPE_UINT32); VK_INDEX_TYPE_UINT32);
VkDescriptorSet sets[] = { VkDescriptorSet sets[] = {
Vulkan_Matrix_Descrptors (ctx, ctx->curFrame), Vulkan_Matrix_Descriptors (ctx, ctx->curFrame),
bctx->descriptors, bctx->descriptors,
}; };
dfunc->vkCmdBindDescriptorSets (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS, dfunc->vkCmdBindDescriptorSets (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,

2
libs/video/renderer/vulkan/vulkan_draw.c
View File

@ -794,7 +794,7 @@ Vulkan_FlushText (qfv_renderframe_t *rFrame)
dfunc->vkCmdBindIndexBuffer (cmd, dctx->ind_buffer, 0, dfunc->vkCmdBindIndexBuffer (cmd, dctx->ind_buffer, 0,
VK_INDEX_TYPE_UINT32); VK_INDEX_TYPE_UINT32);
VkDescriptorSet set[2] = { VkDescriptorSet set[2] = {
Vulkan_Matrix_Descrptors (ctx, ctx->curFrame), Vulkan_Matrix_Descriptors (ctx, ctx->curFrame),
dframe->descriptors, dframe->descriptors,
}; };
VkPipelineLayout layout = dctx->layout; VkPipelineLayout layout = dctx->layout;

2
libs/video/renderer/vulkan/vulkan_matrices.c
View File

@ -274,7 +274,7 @@ Vulkan_Matrix_Shutdown (vulkan_ctx_t *ctx)
} }
VkDescriptorSet VkDescriptorSet
Vulkan_Matrix_Descrptors (vulkan_ctx_t *ctx, int frame) Vulkan_Matrix_Descriptors (vulkan_ctx_t *ctx, int frame)
{ {
__auto_type mctx = ctx->matrix_context; __auto_type mctx = ctx->matrix_context;
return mctx->frames.a[frame].descriptors; return mctx->frames.a[frame].descriptors;