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

Change code version to 'ReRelease 8.21.1'

Browse source
This commit is contained in:
Denis Pauk 2023-10-12 18:45:23 +03:00
parent 19b29c648f
commit 7084e8d7cd
7 changed files with 56 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/client/refresh/vk/header/local.h
View file

@ -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;

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

@ -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;

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

@ -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);

50
src/client/refresh/vk/vk_surf.c
View file

@ -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);

10
src/client/refresh/vk/vk_warp.c
View file

@ -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;

2
src/common/collision.c
View file

@ -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);

2
src/common/header/common.h
View file

@ -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