yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-10 07:12:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

vk: merge QVk_DrawColorRect calls

Browse source
This commit is contained in:
Denis Pauk 2024-08-25 14:35:15 +03:00
parent d9da999bcd
commit a06ef9aa4a
4 changed files with 122 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/client/refresh/vk/header/qvk.h
View file

@ -332,7 +332,9 @@ uint8_t* QVk_GetStagingBuffer(VkDeviceSize size, int alignment, VkCommandBuffer
void GenFanIndexes(uint16_t *data, int from, int to);
void GenStripIndexes(uint16_t *data, int from, int to);
VkBuffer* UpdateIndexBuffer(const uint16_t *data, VkDeviceSize bufferSize, VkDeviceSize *dstOffset);
void QVk_DrawColorRect(float *ubo, VkDeviceSize uboSize, qvkrenderpasstype_t rpType);
void QVk_Draw2DCallsRender(void);
void QVk_DrawColorRect(float x, float y, float w, float h,
float r, float g, float b, float a, qvkrenderpasstype_t rpType);
void QVk_DrawTexRect(const float *ubo, VkDeviceSize uboSize, qvktexture_t *texture);
void QVk_BindPipeline(qvkpipeline_t *pipeline);
void QVk_SubmitStagingBuffers(void);

120
src/client/refresh/vk/vk_common.c
View file

@ -261,6 +261,14 @@ static const char *renderpassObjectNames[] = {
"RP_WORLD_WARP"
};
#define MAXDRAWCALLS 4
static int draw2dcolor_num = 0;
static float draw2dcolor_calls[8 * MAXDRAWCALLS] = {0};
static uint16_t draw2dcolor_indices[6 * MAXDRAWCALLS] = {0};
static float draw2dcolor_r, draw2dcolor_g, draw2dcolor_b, draw2dcolor_a;
static qvkrenderpasstype_t draw2dcolor_rpType;
VkFormat QVk_FindDepthFormat()
{
VkFormat depthFormats[] = {
@ -1691,6 +1699,18 @@ qboolean QVk_Init(void)
{
int i;
/* gen color index buffer */
draw2dcolor_num = 0;
for (i = 0; i < MAXDRAWCALLS; i ++)
{
draw2dcolor_indices[6 * i + 0] = i * 4 + 0;
draw2dcolor_indices[6 * i + 1] = i * 4 + 1;
draw2dcolor_indices[6 * i + 2] = i * 4 + 2;
draw2dcolor_indices[6 * i + 3] = i * 4 + 0;
draw2dcolor_indices[6 * i + 4] = i * 4 + 3;
draw2dcolor_indices[6 * i + 5] = i * 4 + 1;
}
PFN_vkEnumerateInstanceVersion vkEnumerateInstanceVersion = (PFN_vkEnumerateInstanceVersion)vkGetInstanceProcAddr(NULL, "vkEnumerateInstanceVersion");
uint32_t instanceVersion = VK_API_VERSION_1_0;
@ -2186,6 +2206,8 @@ VkResult QVk_EndFrame(qboolean force)
if (!vk_frameStarted)
return VK_SUCCESS;
QVk_Draw2DCallsRender();
// this may happen if Sys_Error is issued mid-frame, so we need to properly advance the draw pipeline
if (force)
{
@ -2605,40 +2627,90 @@ VkSampler QVk_UpdateTextureSampler(qvktexture_t *texture, qvksampler_t samplerTy
return vk_samplers[samplerIndex];
}
void QVk_DrawColorRect(float *ubo, VkDeviceSize uboSize, qvkrenderpasstype_t rpType)
void
QVk_Draw2DCallsRender(void)
{
VkBuffer *buffer;
VkDeviceSize dstOffset;
uint32_t uboOffset;
VkDescriptorSet uboDescriptorSet;
VkDeviceSize vboOffset;
VkBuffer vbo;
VkDeviceSize dstOffset, vboOffset, vertSize;
uint8_t *vertData, *uboData;
VkBuffer *buffer, vbo;
uint32_t uboOffset;
uint8_t *uboData = QVk_GetUniformBuffer(uboSize,
if (!draw2dcolor_num)
{
return;
}
float imgTransform[] = {
0, 0,
1.0, 1.0,
draw2dcolor_r, draw2dcolor_g, draw2dcolor_b, draw2dcolor_a
};
uboData = QVk_GetUniformBuffer(sizeof(imgTransform),
&uboOffset, &uboDescriptorSet);
memcpy(uboData, ubo, uboSize);
memcpy(uboData, imgTransform, sizeof(imgTransform));
buffer = UpdateIndexBuffer(
draw2dcolor_indices, draw2dcolor_num * 6 * sizeof(uint16_t), &dstOffset);
const uint16_t indices[] = { 0, 1, 2, 0, 3, 1 };
buffer = UpdateIndexBuffer(indices, sizeof(indices), &dstOffset);
vertSize = draw2dcolor_num * 8 * sizeof(float);
vertData = QVk_GetVertexBuffer(vertSize, &vbo, &vboOffset);
memcpy(vertData, draw2dcolor_calls, vertSize);
const float colorVerts[] = { -1., -1.,
1., 1.,
-1., 1.,
1., -1. };
uint8_t *vertData = QVk_GetVertexBuffer(sizeof(colorVerts), &vbo, &vboOffset);
memcpy(vertData, colorVerts, sizeof(colorVerts));
QVk_BindPipeline(&vk_drawColorQuadPipeline[rpType]);
QVk_BindPipeline(&vk_drawColorQuadPipeline[draw2dcolor_rpType]);
vkCmdBindDescriptorSets(vk_activeCmdbuffer, VK_PIPELINE_BIND_POINT_GRAPHICS,
vk_drawColorQuadPipeline[rpType].layout, 0, 1, &uboDescriptorSet, 1, &uboOffset);
vk_drawColorQuadPipeline[draw2dcolor_rpType].layout, 0, 1, &uboDescriptorSet, 1, &uboOffset);
vkCmdBindVertexBuffers(vk_activeCmdbuffer, 0, 1,
&vbo, &vboOffset);
vkCmdBindIndexBuffer(vk_activeCmdbuffer,
*buffer, dstOffset, VK_INDEX_TYPE_UINT16);
vkCmdDrawIndexed(vk_activeCmdbuffer, 6, 1, 0, 0, 0);
vkCmdDrawIndexed(vk_activeCmdbuffer, 6 * draw2dcolor_num, 1, 0, 0, 0);
draw2dcolor_num = 0;
}
void
QVk_DrawColorRect(float x, float y, float w, float h, float r, float g, float b, float a,
qvkrenderpasstype_t rpType)
{
float *last;
int i;
if (!draw2dcolor_num)
{
draw2dcolor_r = r;
draw2dcolor_g = g;
draw2dcolor_b = b;
draw2dcolor_a = a;
draw2dcolor_rpType = rpType;
}
else if ((draw2dcolor_num >= MAXDRAWCALLS) ||
(draw2dcolor_r != r) || (draw2dcolor_g != g) ||
(draw2dcolor_b != b) || (draw2dcolor_a != a))
{
QVk_Draw2DCallsRender();
}
/* save new row */
last = draw2dcolor_calls + draw2dcolor_num * 8;
draw2dcolor_num++;
last[0] = x;
last[1] = y;
last[2] = x + w;
last[3] = y + h;
last[4] = x;
last[5] = y + h;
last[6] = x + w;
last[7] = y;
for (i = 0; i < 8; i++)
{
last[i] = last[i] * 2 - 1;
}
}
void QVk_DrawTexRect(const float *ubo, VkDeviceSize uboSize, qvktexture_t *texture)
{
VkBuffer *buffer;
@ -2648,6 +2720,8 @@ void QVk_DrawTexRect(const float *ubo, VkDeviceSize uboSize, qvktexture_t *textu
VkDeviceSize vboOffset;
VkBuffer vbo;
QVk_Draw2DCallsRender();
uint8_t *uboData = QVk_GetUniformBuffer(uboSize, &uboOffset, &uboDescriptorSet);
memcpy(uboData, ubo, uboSize);
@ -2662,8 +2736,8 @@ void QVk_DrawTexRect(const float *ubo, VkDeviceSize uboSize, qvktexture_t *textu
vkCmdPushConstants(vk_activeCmdbuffer, vk_drawTexQuadPipeline[vk_state.current_renderpass].layout,
VK_SHADER_STAGE_FRAGMENT_BIT, 17 * sizeof(float), sizeof(gamma), &gamma);
const uint16_t indices[] = { 0, 1, 2, 0, 3, 1 };
buffer = UpdateIndexBuffer(indices, sizeof(indices), &dstOffset);
buffer = UpdateIndexBuffer(
draw2dcolor_indices, 6 * sizeof(uint16_t), &dstOffset);
const float texVerts[] = { -1., -1., 0., 0.,
1., 1., 1., 1.,

19
src/client/refresh/vk/vk_draw.c
View file

@ -237,10 +237,14 @@ void RE_Draw_Fill (int x, int y, int w, int h, int c)
color.c = d_8to24table[c];
float imgTransform[] = { (float)x / vid.width, (float)y / vid.height,
(float)w / vid.width, (float)h / vid.height,
color.v[0] / 255.f, color.v[1] / 255.f, color.v[2] / 255.f, 1.f };
QVk_DrawColorRect(imgTransform, sizeof(imgTransform), RP_UI);
QVk_DrawColorRect(
(float)x / vid.width, (float)y / vid.height,
(float)w / vid.width, (float)h / vid.height,
(float)color.v[0] / 255.f,
(float)color.v[1] / 255.f,
(float)color.v[2] / 255.f,
1.f,
RP_UI);
}
//=============================================================================
@ -253,12 +257,13 @@ RE_Draw_FadeScreen
*/
void RE_Draw_FadeScreen (void)
{
float imgTransform[] = { 0.f, 0.f, vid.width, vid.height, 0.f, 0.f, 0.f, .8f };
if (!vk_frameStarted)
return;
QVk_DrawColorRect(imgTransform, sizeof(imgTransform), RP_UI);
QVk_DrawColorRect(
0.0f, 0.0f, 1.0f, 1.0f,
0.f, 0.f, 0.f, .8f,
RP_UI);
}

16
src/client/refresh/vk/vk_main.c
View file

@ -617,8 +617,10 @@ R_PolyBlend(void)
return;
}
float polyTransform[] = { 0.f, 0.f, vid.width, vid.height, v_blend[0], v_blend[1], v_blend[2], v_blend[3] };
QVk_DrawColorRect(polyTransform, sizeof(polyTransform), RP_WORLD);
QVk_DrawColorRect(
0.f, 0.f, 1.0f, 1.0f,
v_blend[0], v_blend[1], v_blend[2], v_blend[3],
RP_WORLD);
}
static void
@ -693,10 +695,12 @@ R_SetupFrame(void)
unlike OpenGL, draw a rectangle in proper location - it's easier to do in Vulkan */
if (r_newrefdef.rdflags & RDF_NOWORLDMODEL)
{
float clearArea[] = { (float)r_newrefdef.x / vid.width, (float)r_newrefdef.y / vid.height,
(float)r_newrefdef.width / vid.width, (float)r_newrefdef.height / vid.height,
.3f, .3f, .3f, 1.f };
QVk_DrawColorRect(clearArea, sizeof(clearArea), RP_UI);
QVk_DrawColorRect(
(float)r_newrefdef.x / vid.width,
(float)r_newrefdef.y / vid.height,
(float)r_newrefdef.width / vid.width,
(float)r_newrefdef.height / vid.height,
.3f, .3f, .3f, 1.f , RP_UI);
}
}