fte/fteqw
2
0
Fork 1
Code Issues Pull requests Releases 1 Activity Actions

try to fix vulkan validation warnings (and maybe some crashes on amd gpus)

Browse source 
fix sdl1 not compiling.
fix temporalscenecache with q3bsp
add the net_wm_ping protocol to fte's native x11 stuff, allowing our process to be killed if we lock up (usually due to vulkan drivers...).
qccguiqt: actually save the config.
try to fix hl fonts


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5785 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2020-11-04 10:19:30 +00:00
parent 5d5067ed82
commit 29cb22af8e
33 changed files with 592 additions and 387 deletions
Download patch file Download diff file Expand all files Collapse all files

40
engine/shaders/makevulkanblob.c
View file

@ -1,6 +1,9 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "../client/quakedef.h"
#include "../gl/shader.h"
void dumpprogblob(FILE *out, unsigned char *buf, unsigned int size)
{
if (out)
@ -173,7 +176,7 @@ int generatevulkanblobs(struct blobheader *blob, size_t maxblobsize, const char
arg = strtok(NULL, " ,=\r\n");
if (!arg)
{
printf("%s has no default value. Assuming 0\n", cb+4);
printf(" cvar %s has no default value. Assuming 0\n", (char*)blob + blob->cvarsoffset + blob->cvarslength+4);
u[i].u = 0; //0 either way.
}
else if (type == 'f' || type == 'F')
@ -217,41 +220,43 @@ int generatevulkanblobs(struct blobheader *blob, size_t maxblobsize, const char
{
//light
if (!strcasecmp(arg, "shadowmap"))
blob->defaulttextures |= 1u<<0;
blob->defaulttextures |= 1u<<S_SHADOWMAP;
else if (!strcasecmp(arg, "projectionmap"))
blob->defaulttextures |= 1u<<1;
blob->defaulttextures |= 1u<<S_PROJECTIONMAP;
//material
else if (!strcasecmp(arg, "diffuse"))
blob->defaulttextures |= 1u<<2;
blob->defaulttextures |= 1u<<S_DIFFUSE;
else if (!strcasecmp(arg, "normalmap"))
blob->defaulttextures |= 1u<<3;
blob->defaulttextures |= 1u<<S_NORMALMAP;
else if (!strcasecmp(arg, "specular"))
blob->defaulttextures |= 1u<<4;
blob->defaulttextures |= 1u<<S_SPECULAR;
else if (!strcasecmp(arg, "upper"))
blob->defaulttextures |= 1u<<5;
blob->defaulttextures |= 1u<<S_UPPERMAP;
else if (!strcasecmp(arg, "lower"))
blob->defaulttextures |= 1u<<6;
blob->defaulttextures |= 1u<<S_LOWERMAP;
else if (!strcasecmp(arg, "fullbright"))
blob->defaulttextures |= 1u<<7;
blob->defaulttextures |= 1u<<S_FULLBRIGHT;
else if (!strcasecmp(arg, "paletted"))
blob->defaulttextures |= 1u<<8;
blob->defaulttextures |= 1u<<S_PALETTED;
else if (!strcasecmp(arg, "reflectcube"))
blob->defaulttextures |= 1u<<9;
blob->defaulttextures |= 1u<<S_REFLECTCUBE;
else if (!strcasecmp(arg, "reflectmask"))
blob->defaulttextures |= 1u<<10;
blob->defaulttextures |= 1u<<S_REFLECTMASK;
else if (!strcasecmp(arg, "displacement"))
blob->defaulttextures |= 1u<<11;
blob->defaulttextures |= 1u<<S_DISPLACEMENT;
else if (!strcasecmp(arg, "occlusion"))
blob->defaulttextures |= 1u<<S_OCCLUSION;
//batch
else if (!strcasecmp(arg, "lightmap"))
blob->defaulttextures |= 1u<<12;
blob->defaulttextures |= 1u<<S_LIGHTMAP0;
else if (!strcasecmp(arg, "deluxemap") || !strcasecmp(arg, "deluxmap"))
blob->defaulttextures |= 1u<<13;
blob->defaulttextures |= 1u<<S_DELUXEMAP0;
else if (!strcasecmp(arg, "lightmaps"))
blob->defaulttextures |= 1u<<12 | 1u<<14 | 1u<<15 | 1u<<16;
blob->defaulttextures |= 1u<<S_LIGHTMAP0 | 1u<<S_LIGHTMAP1 | 1u<<S_LIGHTMAP2 | 1u<<S_LIGHTMAP3;
else if (!strcasecmp(arg, "deluxemaps") || !strcasecmp(arg, "deluxmaps"))
blob->defaulttextures |= 1u<<13 | 1u<<17 | 1u<<18 | 1u<<19;
blob->defaulttextures |= 1u<<S_DELUXEMAP0 | 1u<<S_DELUXEMAP1 | 1u<<S_DELUXEMAP2 | 1u<<S_DELUXEMAP3;
//shader pass
else if ((i=atoi(arg)))
@ -307,6 +312,7 @@ int generatevulkanblobs(struct blobheader *blob, size_t maxblobsize, const char
"uniform samplerCube s_reflectcube;\n",
"uniform sampler2D s_reflectmask;\n",
"uniform sampler2D s_displacement;\n",
"uniform sampler2D s_occlusion;\n",
//batch
"uniform sampler2D s_lightmap;\n#define s_lightmap0 s_lightmap\n",