diff --git a/src/client/refresh/vk/header/local.h b/src/client/refresh/vk/header/local.h index 1b3c2b57..d0688d75 100644 --- a/src/client/refresh/vk/header/local.h +++ b/src/client/refresh/vk/header/local.h @@ -358,7 +358,7 @@ typedef struct { typedef struct { float vertex[3]; float texCoord[2]; - float texCoordLmap[2]; + float lmTexCoord[2]; } lmappolyvert_t; extern polyvert_t *verts_buffer; diff --git a/src/client/refresh/vk/vk_common.c b/src/client/refresh/vk/vk_common.c index 55033d02..91b75623 100644 --- a/src/client/refresh/vk/vk_common.c +++ b/src/client/refresh/vk/vk_common.c @@ -2671,7 +2671,10 @@ void QVk_DrawTexRect(const float *ubo, VkDeviceSize uboSize, qvktexture_t *textu QVk_BindPipeline(&vk_drawTexQuadPipeline[vk_state.current_renderpass]); VkDeviceSize offsets = 0; - VkDescriptorSet descriptorSets[] = { texture->descriptorSet, uboDescriptorSet }; + VkDescriptorSet descriptorSets[] = { + texture->descriptorSet, + uboDescriptorSet + }; float gamma = 2.1F - vid_gamma->value; diff --git a/src/client/refresh/vk/vk_mesh.c b/src/client/refresh/vk/vk_mesh.c index 22cf03fd..f834fd46 100644 --- a/src/client/refresh/vk/vk_mesh.c +++ b/src/client/refresh/vk/vk_mesh.c @@ -428,7 +428,10 @@ Vk_DrawAliasFrameLerpCommands (entity_t *currententity, int *order, int *order_e memcpy(vertData, vertList[p], vaoSize); QVk_BindPipeline(&pipelines[translucentIdx][leftHandOffset]); - VkDescriptorSet descriptorSets[] = { skin->vk_texture.descriptorSet, uboDescriptorSet }; + VkDescriptorSet descriptorSets[] = { + skin->vk_texture.descriptorSet, + uboDescriptorSet + }; vkCmdBindDescriptorSets(vk_activeCmdbuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, pipelines[translucentIdx][leftHandOffset].layout, 0, 2, descriptorSets, 1, &uboOffset); vkCmdBindVertexBuffers(vk_activeCmdbuffer, 0, 1, &vbo, &vboOffset); diff --git a/src/client/refresh/vk/vk_surf.c b/src/client/refresh/vk/vk_surf.c index b7c55560..2dff675b 100644 --- a/src/client/refresh/vk/vk_surf.c +++ b/src/client/refresh/vk/vk_surf.c @@ -66,7 +66,10 @@ DrawVkPoly(mpoly_t *p, image_t *texture, float *color) memcpy(vertData, verts_buffer, sizeof(polyvert_t) * p->numverts); memcpy(uboData, color, sizeof(float) * 4); - VkDescriptorSet descriptorSets[] = { texture->vk_texture.descriptorSet, uboDescriptorSet }; + VkDescriptorSet descriptorSets[] = { + texture->vk_texture.descriptorSet, + uboDescriptorSet + }; float gamma = 2.1F - vid_gamma->value; @@ -125,7 +128,10 @@ static void DrawVkFlowingPoly (msurface_t *fa, image_t *texture, float *color) memcpy(vertData, verts_buffer, sizeof(polyvert_t) * p->numverts); memcpy(uboData, color, sizeof(float) * 4); - VkDescriptorSet descriptorSets[] = { texture->vk_texture.descriptorSet, uboDescriptorSet }; + VkDescriptorSet descriptorSets[] = { + texture->vk_texture.descriptorSet, + uboDescriptorSet + }; float gamma = 2.1F - vid_gamma->value; @@ -489,7 +495,11 @@ Vk_RenderLightmappedPoly(msurface_t *surf, float *modelMatrix, float alpha, enti VkBuffer vbo; VkDeviceSize vboOffset; - VkDescriptorSet descriptorSets[] = { image->vk_texture.descriptorSet, uboDescriptorSet, vk_state.lightmap_textures[lmtex].descriptorSet }; + VkDescriptorSet descriptorSets[] = { + image->vk_texture.descriptorSet, + uboDescriptorSet, + vk_state.lightmap_textures[lmtex].descriptorSet + }; vkCmdBindDescriptorSets(vk_activeCmdbuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, vk_drawPolyLmapPipeline.layout, 0, 3, descriptorSets, 1, &uboOffset); for (p = surf->polys; p; p = p->chain) @@ -502,8 +512,8 @@ Vk_RenderLightmappedPoly(msurface_t *surf, float *modelMatrix, float alpha, enti VectorCopy(v->pos, lmappolyverts_buffer[i].vertex); lmappolyverts_buffer[i].texCoord[0] = v->texCoord[0] + scroll; lmappolyverts_buffer[i].texCoord[1] = v->texCoord[1]; - lmappolyverts_buffer[i].texCoordLmap[0] = v->lmTexCoord[0]; - lmappolyverts_buffer[i].texCoordLmap[1] = v->lmTexCoord[1]; + lmappolyverts_buffer[i].lmTexCoord[0] = v->lmTexCoord[0]; + lmappolyverts_buffer[i].lmTexCoord[1] = v->lmTexCoord[1]; } uint8_t *vertData = QVk_GetVertexBuffer(sizeof(lmappolyvert_t) * nv, &vbo, &vboOffset); @@ -518,7 +528,11 @@ Vk_RenderLightmappedPoly(msurface_t *surf, float *modelMatrix, float alpha, enti { VkBuffer vbo; VkDeviceSize vboOffset; - VkDescriptorSet descriptorSets[] = { image->vk_texture.descriptorSet, uboDescriptorSet, vk_state.lightmap_textures[lmtex].descriptorSet }; + VkDescriptorSet descriptorSets[] = { + image->vk_texture.descriptorSet, + uboDescriptorSet, + vk_state.lightmap_textures[lmtex].descriptorSet + }; vkCmdBindDescriptorSets(vk_activeCmdbuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, vk_drawPolyLmapPipeline.layout, 0, 3, descriptorSets, 1, &uboOffset); for (p = surf->polys; p; p = p->chain) @@ -531,8 +545,8 @@ Vk_RenderLightmappedPoly(msurface_t *surf, float *modelMatrix, float alpha, enti VectorCopy(v->pos, lmappolyverts_buffer[i].vertex); lmappolyverts_buffer[i].texCoord[0] = v->texCoord[0]; lmappolyverts_buffer[i].texCoord[1] = v->texCoord[1]; - lmappolyverts_buffer[i].texCoordLmap[0] = v->lmTexCoord[0]; - lmappolyverts_buffer[i].texCoordLmap[1] = v->lmTexCoord[1]; + lmappolyverts_buffer[i].lmTexCoord[0] = v->lmTexCoord[0]; + lmappolyverts_buffer[i].lmTexCoord[1] = v->lmTexCoord[1]; } uint8_t *vertData = QVk_GetVertexBuffer(sizeof(lmappolyvert_t) * nv, &vbo, &vboOffset); @@ -570,8 +584,8 @@ Vk_RenderLightmappedPoly(msurface_t *surf, float *modelMatrix, float alpha, enti VectorCopy(v->pos, lmappolyverts_buffer[i].vertex); lmappolyverts_buffer[i].texCoord[0] = v->texCoord[0] + scroll; lmappolyverts_buffer[i].texCoord[1] = v->texCoord[1]; - lmappolyverts_buffer[i].texCoordLmap[0] = v->lmTexCoord[0]; - lmappolyverts_buffer[i].texCoordLmap[1] = v->lmTexCoord[1]; + lmappolyverts_buffer[i].lmTexCoord[0] = v->lmTexCoord[0]; + lmappolyverts_buffer[i].lmTexCoord[1] = v->lmTexCoord[1]; } VkBuffer vbo; @@ -579,7 +593,11 @@ Vk_RenderLightmappedPoly(msurface_t *surf, float *modelMatrix, float alpha, enti uint8_t *vertData = QVk_GetVertexBuffer(sizeof(lmappolyvert_t) * nv, &vbo, &vboOffset); memcpy(vertData, lmappolyverts_buffer, sizeof(lmappolyvert_t) * nv); - VkDescriptorSet descriptorSets[] = { image->vk_texture.descriptorSet, uboDescriptorSet, vk_state.lightmap_textures[lmtex].descriptorSet }; + VkDescriptorSet descriptorSets[] = { + image->vk_texture.descriptorSet, + uboDescriptorSet, + vk_state.lightmap_textures[lmtex].descriptorSet + }; vkCmdBindDescriptorSets(vk_activeCmdbuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, vk_drawPolyLmapPipeline.layout, 0, 3, descriptorSets, 1, &uboOffset); vkCmdBindVertexBuffers(vk_activeCmdbuffer, 0, 1, &vbo, &vboOffset); vkCmdBindIndexBuffer(vk_activeCmdbuffer, QVk_GetTriangleFanIbo((nv - 2) * 3), 0, VK_INDEX_TYPE_UINT16); @@ -600,8 +618,8 @@ Vk_RenderLightmappedPoly(msurface_t *surf, float *modelMatrix, float alpha, enti VectorCopy(v->pos, lmappolyverts_buffer[i].vertex); lmappolyverts_buffer[i].texCoord[0] = v->texCoord[0]; lmappolyverts_buffer[i].texCoord[1] = v->texCoord[1]; - lmappolyverts_buffer[i].texCoordLmap[0] = v->lmTexCoord[0]; - lmappolyverts_buffer[i].texCoordLmap[1] = v->lmTexCoord[1]; + lmappolyverts_buffer[i].lmTexCoord[0] = v->lmTexCoord[0]; + lmappolyverts_buffer[i].lmTexCoord[1] = v->lmTexCoord[1]; } VkBuffer vbo; @@ -609,7 +627,11 @@ Vk_RenderLightmappedPoly(msurface_t *surf, float *modelMatrix, float alpha, enti uint8_t *vertData = QVk_GetVertexBuffer(sizeof(lmappolyvert_t) * nv, &vbo, &vboOffset); memcpy(vertData, lmappolyverts_buffer, sizeof(lmappolyvert_t) * nv); - VkDescriptorSet descriptorSets[] = { image->vk_texture.descriptorSet, uboDescriptorSet, vk_state.lightmap_textures[lmtex].descriptorSet }; + VkDescriptorSet descriptorSets[] = { + image->vk_texture.descriptorSet, + uboDescriptorSet, + vk_state.lightmap_textures[lmtex].descriptorSet + }; vkCmdBindDescriptorSets(vk_activeCmdbuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, vk_drawPolyLmapPipeline.layout, 0, 3, descriptorSets, 1, &uboOffset); vkCmdBindVertexBuffers(vk_activeCmdbuffer, 0, 1, &vbo, &vboOffset); vkCmdBindIndexBuffer(vk_activeCmdbuffer, QVk_GetTriangleFanIbo((nv - 2) * 3), 0, VK_INDEX_TYPE_UINT16); diff --git a/src/client/refresh/vk/vk_warp.c b/src/client/refresh/vk/vk_warp.c index 93f98297..54a23f83 100644 --- a/src/client/refresh/vk/vk_warp.c +++ b/src/client/refresh/vk/vk_warp.c @@ -102,7 +102,10 @@ EmitWaterPolys(msurface_t *fa, image_t *texture, float *modelMatrix, VkBuffer vbo; VkDeviceSize vboOffset; - VkDescriptorSet descriptorSets[] = { texture->vk_texture.descriptorSet, uboDescriptorSet }; + VkDescriptorSet descriptorSets[] = { + texture->vk_texture.descriptorSet, + uboDescriptorSet + }; float gamma = 2.1F - vid_gamma->value; @@ -247,7 +250,10 @@ R_DrawSkyBox(void) uint8_t *vertData = QVk_GetVertexBuffer(sizeof(verts), &vbo, &vboOffset); memcpy(vertData, verts, sizeof(verts)); - VkDescriptorSet descriptorSets[] = { sky_images[skytexorder[i]]->vk_texture.descriptorSet, uboDescriptorSet }; + VkDescriptorSet descriptorSets[] = { + sky_images[skytexorder[i]]->vk_texture.descriptorSet, + uboDescriptorSet + }; float gamma = 2.1F - vid_gamma->value; diff --git a/src/common/collision.c b/src/common/collision.c index 6f0800d2..b461f360 100644 --- a/src/common/collision.c +++ b/src/common/collision.c @@ -2040,6 +2040,8 @@ CM_LoadMap(char *name, qboolean clientload, unsigned *checksum) CMod_LoadEntityString(cmod.name, &cmod.map_entitystring, &cmod.numentitychars, cmod_base, &header.lumps[LUMP_ENTITIES]); cmod.extradatasize = Hunk_End(); + Com_DPrintf("Allocated %d from expected %d hunk size\n", + cmod.extradatasize, hunkSize); FS_FreeFile(buf); diff --git a/src/common/header/common.h b/src/common/header/common.h index 0fab0b2f..d500ed68 100644 --- a/src/common/header/common.h +++ b/src/common/header/common.h @@ -32,7 +32,7 @@ #include "shared.h" #include "crc.h" -#define YQ2VERSION "8.21pre" +#define YQ2VERSION "ReRelease 8.21.1" #define BASEDIRNAME "baseq2" #ifndef YQ2OSTYPE