openxr plugin: tweaked - inputs should be working properly now, and are visible to csqc. subject to further breaking changes, however.

_pext_vrinputs: added cvar to enable vr inputs protocol extension allowing vr inputs to be networked to ssqc too. defaults to 0 for now, will be renamed when deemed final.
updates menu: the prompt to enable sources is now more explicit instead of expecting the user to have a clue.
updates menu: added a v3 sources format, which should be more maintainable. not final.
updates menu: try to give reasons why sources might be failing (to help blame ISPs if they try fucking over TTH dns again).
presets menu: no longer closes the instant a preset is chosen. some presets have a couple of modifiers listed. force the demo loop in the background to serve as a preview.
prompts menus: now does word wrapping.
ftemaster: support importing server lists from other master servers (requested by Eukara).
server: try to detect when non-reply inbound packets are blocked by firewalls/nats/etc (using ftemaster to do so).
qcvm: added pointcontentsmask builtin, allowing it to probe more than just world, with fte's full contentbit range instead of just q1 legacy.
qcvm: memfill8 builtin now works on createbuffer() pointers.
qcvm: add missing unsigned ops. Fixed double comparison ops. fixed bug with op_store_i64. added missing OP_LOADP_I64
qcc: added '#pragma framerate RATE' for overriding implicit nextthink durations.
qcc: fixed '#pragma DONT_COMPILE_THIS_FILE' to not screw up comments.
qcc: added __GITURL__ __GITHASH__ __GITDATE__ __GITDATETIME__ __GITDESC__ for any mods that might want to make use of that.
qcc: fix up -Fhashonly a little
setrenderer: support for vulkan gpu enumeration.
rulesets: reworked to support custom rulesets (using hashes to catch haxxors, though still nothing prevents just changing the client to ignore rulesets)
bspx: use our BIH code for the bspx BRUSHLIST lump instead of the older less efficient code.
(static)iqm+obj: these model formats can now be used for the worldmodel (with a suitable .ent file). Also using BIH for much better collision performance.
pmove: tried to optimise PM_NudgePosition, should boost fps in stress tests.
wayland: fix a crash on startup. mousegrabs now works better.
imagetool: uses sdl for previews.


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5813 fc73d0e0-1445-4013-8a0c-d673dee63da5

engine/shaders/Makefile

@@ -6,7 +6,7 @@ VKSDKPATH ?= ~/VulkanSDK/1.1.73.0/x86_64/bin/
 
 all:
 
-NAMES=	fixedemu	altwater	bloom_blur	bloom_filter	bloom_final	colourtint	crepuscular_opaque	crepuscular_rays	crepuscular_sky	depthonly	default2d	defaultadditivesprite		defaultskin	defaultsky	defaultskybox	defaultfill	defaultsprite	defaultwall	defaultwarp	defaultgammacb	drawflat_wall	lpp_depthnorm	lpp_light	lpp_wall	postproc_fisheye	postproc_panorama	postproc_laea	postproc_stereographic	postproc_equirectangular	fxaa	underwaterwarp	menutint	terrain	rtlight
+NAMES=	fixedemu	fixedemu_flat altwater	bloom_blur	bloom_filter	bloom_final	colourtint	crepuscular_opaque	crepuscular_rays	crepuscular_sky	depthonly	default2d	defaultadditivesprite		defaultskin	defaultsky	defaultskybox	defaultfill	defaultsprite	defaultwall	defaultwarp	defaultgammacb	drawflat_wall	lpp_depthnorm	lpp_light	lpp_wall	postproc_fisheye	postproc_panorama	postproc_laea	postproc_stereographic	postproc_equirectangular	fxaa	underwaterwarp	menutint	terrain	rtlight
 
 
 ALLNAMES+=$(foreach v,$(NAMES),glsl/$v.glsl)

engine/shaders/generatebuiltinsl.c

@@ -5,6 +5,7 @@
 char shaders[][64] =
 {
 	"fixedemu",
+	"fixedemu_flat",
 	"q3terrain",
 	"altwater",
 	"bloom_blur",

engine/shaders/vulkan/fixedemu.glsl

@@ -1,13 +1,7 @@
-!!argb constcolour=0
 !!samps 1
 
 layout(constant_id = 0) const int alphatest = 4;
 
-layout(push_constant) uniform pushintf
-{
-	vec4 colour;	
-} push;
-
 //this shader is present for support for gles/gl3core contexts
 //it is single-texture-with-vertex-colours, and doesn't do anything special.
 //beware that a few things use this, including apparently fonts and bloom rescaling.
@@ -22,10 +16,7 @@ layout(location=1) varying vec4 vc;
 void main ()
 {
 	tc = v_texcoord;
-	if (arg_constcolour)
-		vc = push.colour;
-	else
-		vc = v_colour;
+	vc = v_colour;
 	gl_Position = ftetransform();
 }
 #endif

engine/shaders/vulkan/fixedemu_flat.glsl

@@ -0,0 +1,50 @@
+!!samps 1
+
+layout(constant_id = 0) const int alphatest = 4;
+
+//this shader is present for support for gles/gl3core contexts
+//it is single-texture-with-vertex-colours, and doesn't do anything special.
+//beware that a few things use this, including apparently fonts and bloom rescaling.
+//its really not meant to do anything special.
+
+#include "sys/defs.h"
+
+layout(location=0) varying vec2 tc;
+
+#ifdef VERTEX_SHADER
+void main ()
+{
+	tc = v_texcoord;
+	gl_Position = ftetransform();
+}
+#endif
+
+#ifdef FRAGMENT_SHADER
+layout(push_constant) uniform pushintf
+{
+	vec4 colour;	
+} push;
+
+void main ()
+{
+	vec4 fc = texture2D(s_t0, tc) * push.colour;
+	if (alphatest == 4)
+		discard;
+	if (alphatest == 3)
+	{
+		if (fc.a < 0.5)
+			discard;
+	}
+	else if (alphatest == 2)
+	{
+		if (fc.a <= 0)
+			discard;
+	}
+	else if (alphatest == 1)
+	{
+		if (fc.a >= 0.5)
+			discard;
+	}
+	gl_FragColor = fc;
+}
+#endif